From 422f60a992828af40dc41b6528c67d581019e18c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 22 Jul 2024 10:36:44 -0700 Subject: [PATCH 1/2] shattered-pixel-dungeon: fix evaluation on Nix 2.3.18 To reproduce, run `nix shell nixpkgs#nixVersions.minimum --command nix-build -A shattered-pixel-dungeon` --- pkgs/games/shattered-pixel-dungeon/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix index 7f2f3a14a4d2..3e81c54bba91 100644 --- a/pkgs/games/shattered-pixel-dungeon/generic.nix +++ b/pkgs/games/shattered-pixel-dungeon/generic.nix @@ -53,7 +53,7 @@ let keywords = [ "roguelike" "dungeon" "crawler" ]; }; - depsPath' = if depsPath != null then depsPath else ./${pname}/deps.json; + depsPath' = if depsPath != null then depsPath else ./. + "/${pname}/deps.json"; in stdenv.mkDerivation (cleanAttrs // { inherit pname version src patches postPatch; From 2b7232de1eac33c5a9b81d22fef0c2064fce848b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 22 Jul 2024 10:38:36 -0700 Subject: [PATCH 2/2] gradle.fetchDeps: fix evaluation on Nix 2.3.18 In 2.3, lists aren't able to be compared with `<`, but `builtins.compareVersions` does exist. --- .../development/tools/build-managers/gradle/fetch-deps.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix index f4485609f65f..304898c0131c 100644 --- a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix +++ b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix @@ -123,10 +123,9 @@ let fileList = builtins.filter (x: lib.hasPrefix xmlBase x && x != url) (builtins.attrNames finalData); jarPomList = map parseArtifactUrl fileList; - sortedJarPomList = - lib.sort - (a: b: lib.splitVersion a.version < lib.splitVersion b.version) - jarPomList; + + sortByVersion = a: b: (builtins.compareVersions a.version b.version) < 0; + sortedJarPomList = lib.sort sortByVersion jarPomList; uniqueVersionFiles = builtins.map ({ i, x }: x)