gradle: Add 7-rc-2, leave latest pointing at 6.8 (#117462)
This commit is contained in:
parent
394315def1
commit
2bc413b970
@ -1,6 +1,15 @@
|
||||
{ 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 {
|
||||
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_6_8 = gradleGen rec {
|
||||
name = "gradle-6.8.3";
|
||||
gradle_7 = gradleGen (gradleSpec {
|
||||
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";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz";
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
gradle_5_6 = gradleGen rec {
|
||||
name = "gradle-5.6.4";
|
||||
gradle_5_6 = gradleGen (gradleSpec {
|
||||
version = "5.6.4";
|
||||
nativeVersion = "0.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d";
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
gradle_4_10 = gradleGen rec {
|
||||
name = "gradle-4.10.3";
|
||||
gradle_4_10 = gradleGen (gradleSpec {
|
||||
version = "4.10.3";
|
||||
nativeVersion = "0.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
|
||||
};
|
||||
};
|
||||
});
|
||||
}
|
||||
|
@ -12773,6 +12773,7 @@ in
|
||||
gradle_4 = gradle_4_10;
|
||||
gradle_5 = res.gradleGen.gradle_5_6;
|
||||
gradle_6 = res.gradleGen.gradle_6_8;
|
||||
gradle_7 = res.gradleGen.gradle_7;
|
||||
|
||||
gperf = callPackage ../development/tools/misc/gperf { };
|
||||
# 3.1 changed some parameters from int to size_t, leading to mismatches.
|
||||
|
Loading…
Reference in New Issue
Block a user