b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #159226 from lorenzleutgeb/gradle

Browse source 
gradle: 7.3.3 -> 7.4
This commit is contained in:
Kevin Cox 2022-02-15 15:26:18 -05:00 committed by GitHub
parent 9f7d08df91 f7e01145af
commit 4e883afc5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/science/logic/key/default.nix
View file

@ -38,7 +38,8 @@ let
| sh
'';
outputHashMode = "recursive";
outputHash = "sha256-1TWySkS8w7L6Q+V946kcLOnM4hL3fieFvLrF5BZAlh4=";
outputHashAlgo = "sha256";
outputHash = "sha256-GjBUwJxeyJA6vGrPQVtNpcHb4CJlNlY4kHt1PT21xjo=";
};
in stdenv.mkDerivation rec {
inherit pname version src sourceRoot;

6
pkgs/development/tools/build-managers/gradle/default.nix
View file

@ -96,9 +96,9 @@ rec {
# https://docs.gradle.org/current/userguide/compatibility.html
gradle_7 = gen {
version = "7.3.3";
nativeVersion = "0.22-milestone-21";
sha256 = "00h3z0vxc4hv31sc71gb88r8yabyqgz304wpr0bxhbx2d14f11mm";
version = "7.4";
nativeVersion = "0.22-milestone-23";
sha256 = "0d56bgd2m64pzmycjk29hwdlhbpn1kkm7fjik1sibn6vslw71hlc";
defaultJava = jdk17;
};

18
pkgs/development/tools/build-managers/gradle/update.sh
View file

@ -35,9 +35,13 @@ do
f="gradle-${v}-spec.nix"
if [ -f "$f" ]
if [[ -n "$1" && "$1" != "$v" ]]
then
echo "$v SKIP"
echo "$v SKIP (nomatch)"
continue
elif [ "$1" == "" ] && [ -f "$f" ]
then
echo "$v SKIP (exists)"
continue
fi
@ -45,12 +49,18 @@ do
read -d "\n" gradle_hash gradle_path < <(nix-prefetch-url --print-path $url)
# Prefix and suffix for "native-platform" dependency.
gradle_native_prefix="gradle-$v/lib/native-native-"
gradle_native_prefix="gradle-$v/lib/native-platform-"
gradle_native_suffix=".jar"
gradle_native=$(zipinfo -1 "$gradle_path" "$gradle_native_prefix*$gradle_native_suffix" | head -n1)
tmp=$(mktemp)
zipinfo -1 "$gradle_path" "$gradle_native_prefix*$gradle_native_suffix" > $tmp
gradle_native=$(cat $tmp | head -n1)
gradle_native=${gradle_native#"$gradle_native_prefix"}
gradle_native=${gradle_native%"$gradle_native_suffix"}
# Supported architectures
#grep -Pho "(linux|osx)-\w+" $tmp | sort | uniq
rm -f $tmp
echo -e "{\\n version = \"$v\";\\n nativeVersion = \"$gradle_native\";\\n sha256 = \"$gradle_hash\";\\n}" > $f
echo "$v DONE"

2
pkgs/tools/typesetting/pdftk/default.nix
View file

@ -32,7 +32,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0qx1axqr0h5zbn2z9bnb1d0rbs0vajw4p8szw34nicngnn213g7k";
outputHash = "sha256-IlHuvFfkqM3O+3PPVBqUJzQXJELKGKHrmI1tdxsBpSk=";
};
# Point to our local deps repo