cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

gradle: Add 7-rc-2, leave latest pointing at 6.8 (#117462)

Browse source
This commit is contained in:
Lorenz Leutgeb 2021-04-08 09:24:12 +02:00 committed by GitHub
parent 394315def1
commit 2bc413b970
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,15 @@
{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: { lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
rec { let
gradleSpec = { version, nativeVersion, sha256 }: rec {
inherit nativeVersion;
name = "gradle-${version}";
src = fetchurl {
inherit sha256;
url = "https://services.gradle.org/distributions/${name}-bin.zip";
};
};
in rec {
gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation { gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation {
inherit name src nativeVersion; inherit name src nativeVersion;
@ -52,35 +61,30 @@ rec {
}; };
}; };
# NOTE: Gradle 7 is a release candidate, so point to 6.8.
gradle_latest = gradle_6_8; gradle_latest = gradle_6_8;
gradle_6_8 = gradleGen rec { gradle_7 = gradleGen (gradleSpec {
name = "gradle-6.8.3"; version = "7.0-rc-2";
nativeVersion = "0.22-milestone-11";
sha256 = "0gzvigyvwwizx90vnzhdnbm5rdaki11inxna11s4y67xkn8hrnx5";
});
gradle_6_8 = gradleGen (gradleSpec {
version = "6.8.3";
nativeVersion = "0.22-milestone-9"; nativeVersion = "0.22-milestone-9";
src = fetchurl {
url = "https://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz"; sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz";
}; });
};
gradle_5_6 = gradleGen rec { gradle_5_6 = gradleGen (gradleSpec {
name = "gradle-5.6.4"; version = "5.6.4";
nativeVersion = "0.18"; nativeVersion = "0.18";
src = fetchurl {
url = "https://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d"; sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d";
}; });
};
gradle_4_10 = gradleGen rec { gradle_4_10 = gradleGen (gradleSpec {
name = "gradle-4.10.3"; version = "4.10.3";
nativeVersion = "0.14"; nativeVersion = "0.14";
src = fetchurl {
url = "https://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
}; });
};
} }

1
pkgs/top-level/all-packages.nix
View file

@ -12773,6 +12773,7 @@ in
gradle_4 = gradle_4_10; gradle_4 = gradle_4_10;
gradle_5 = res.gradleGen.gradle_5_6; gradle_5 = res.gradleGen.gradle_5_6;
gradle_6 = res.gradleGen.gradle_6_8; gradle_6 = res.gradleGen.gradle_6_8;
gradle_7 = res.gradleGen.gradle_7;
gperf = callPackage ../development/tools/misc/gperf { }; gperf = callPackage ../development/tools/misc/gperf { };
# 3.1 changed some parameters from int to size_t, leading to mismatches. # 3.1 changed some parameters from int to size_t, leading to mismatches.