Unverified Commit 0ad09cf8 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

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

{gradle.fetchDeps,shattered-pixel-dungeon}: fix eval on Nix 2.3.18
parents f958e536 2b7232de

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

+3 −4
Original line number Diff line number Diff line
@@ -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)

pkgs/games/shattered-pixel-dungeon/generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;