nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 04:45:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #329212 from philiptaron/pr-272380/fix-nix-2.3.18-eval

Browse Source 
{gradle.fetchDeps,shattered-pixel-dungeon}: fix eval on Nix 2.3.18
This commit is contained in:
Robert Hensing 2024-07-24 16:11:12 +02:00 committed by GitHub
commit 0ad09cf8b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/build-managers/gradle/fetch-deps.nix
View File

@ -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)

2
pkgs/games/shattered-pixel-dungeon/generic.nix
View File

@ -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;