From 2b7232de1eac33c5a9b81d22fef0c2064fce848b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 22 Jul 2024 10:38:36 -0700 Subject: [PATCH] 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)