Skip to content

{gradle.fetchDeps,shattered-pixel-dungeon}: fix eval on Nix 2.3.18 #329212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roberth merged 2 commits into from
Jul 24, 2024
Merged

{gradle.fetchDeps,shattered-pixel-dungeon}: fix eval on Nix 2.3.18 #329212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
422f60a
shattered-pixel-dungeon: fix evaluation on Nix 2.3.18
philiptaron Jul 22, 2024
2b7232d
gradle.fetchDeps: fix evaluation on Nix 2.3.18
philiptaron Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pkgs/development/tools/build-managers/gradle/fetch-deps.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkgs/games/shattered-pixel-dungeon/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down