diff --git a/flake.lock b/flake.lock index 47dee54..51b62c5 100644 --- a/flake.lock +++ b/flake.lock @@ -161,11 +161,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { diff --git a/pkgs/default.nix b/pkgs/default.nix index 46138d8..35f1328 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,9 +1,10 @@ { pkgs, + pkgs-unstable, ... }: { gcp-secret-subst = pkgs.callPackage ./gcp-secret-subst { }; - moneydance = pkgs.callPackage ./moneydance.nix { }; + moneydance = pkgs.callPackage ./moneydance.nix { openjdk23 = pkgs-unstable.openjdk23; }; prometheus-jmx = pkgs.callPackage ./prometheus-jmx.nix { }; } diff --git a/pkgs/moneydance.nix b/pkgs/moneydance.nix index c09cec5..1e51dae 100644 --- a/pkgs/moneydance.nix +++ b/pkgs/moneydance.nix @@ -3,12 +3,13 @@ stdenv, fetchzip, makeWrapper, - openjdk21, - openjfx21, + openjdk23, jvmFlags ? [ ], }: let - jdk = openjdk21.override { enableJavaFX = true; }; + jdk = openjdk23.override { + enableJavaFX = true; + }; in stdenv.mkDerivation (finalAttrs: { pname = "moneydance"; @@ -20,15 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - jdk - openjfx21 - ]; - - dontConfigure = true; - dontUnpack = true; - dontBuild = true; - dontFixup = true; + buildInputs = [ jdk ]; # Note the double escaping in the call to makeWrapper. The escapeShellArgs # call quotes each element of the flags list as a word[1] and returns a @@ -65,9 +58,15 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://infinitekind.com/moneydance"; - description = "An easy to use and full-featured personal finance app that doesn't compromise your privacy"; + changelog = "https://infinitekind.com/stabledl/2024_5118/changelog.txt"; + description = "Easy to use and full-featured personal finance app that doesn't compromise your privacy"; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.unfree; - platforms = jdk.meta.platforms; + # Darwin refers to Zulu Java, which breaks the evaluation of this derivation + # for some reason + # + # https://github.com/NixOS/nixpkgs/pull/306372#issuecomment-2111688236 + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.lucasbergman ]; }; })