diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/by-name/po/portfolio/package.nix similarity index 66% rename from pkgs/applications/office/portfolio/default.nix rename to pkgs/by-name/po/portfolio/package.nix index 72cf6cbb5752..1bc1d68a2970 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, autoPatchelfHook -, fetchurl -, glib-networking -, glibc -, gcc-unwrapped -, gtk3 -, jre -, libsecret -, makeDesktopItem -, webkitgtk -, wrapGAppsHook3 -, writeScript +{ + lib, + stdenv, + autoPatchelfHook, + fetchurl, + glib-networking, + glibc, + gcc-unwrapped, + gtk3, + openjdk17, + libsecret, + makeDesktopItem, + webkitgtk, + wrapGAppsHook3, + gitUpdater, }: let desktopItem = makeDesktopItem { @@ -23,15 +24,18 @@ let categories = [ "Office" ]; }; - runtimeLibs = lib.makeLibraryPath [ gtk3 webkitgtk ]; + runtimeLibs = lib.makeLibraryPath [ + gtk3 + webkitgtk + ]; in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.69.0"; + version = "0.69.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-5U1MGZ/CWI0m1utXCak6qWEHIFwMvZSqRt4qrUPCqVo="; + hash = "sha256-Q36pQkxFMwwb6qHZYqer/em6G4TlFmFwtFhB0YUsOlw="; }; nativeBuildInputs = [ @@ -52,7 +56,7 @@ stdenv.mkDerivation rec { makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --prefix PATH : ${jre}/bin + --prefix PATH : ${openjdk17}/bin # Create desktop item mkdir -p $out/share/applications @@ -61,19 +65,18 @@ stdenv.mkDerivation rec { ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm ''; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/buchen/portfolio/tags" | jq '.[0].name' --raw-output)" - update-source-version portfolio "$version" - ''; + passthru.updateScript = gitUpdater { url = "https://github.com/buchen/portfolio.git"; }; meta = with lib; { description = "Simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; - maintainers = with maintainers; [ kilianar oyren shawn8901 ]; + maintainers = with maintainers; [ + kilianar + oyren + shawn8901 + ]; mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06f85d5b605a..1d2e943bae88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32862,10 +32862,6 @@ with pkgs; polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; - portfolio = callPackage ../applications/office/portfolio { - jre = openjdk17; - }; - psi-notify = callPackage ../applications/misc/psi-notify { }; ptex = callPackage ../development/libraries/ptex { };