Merge pull request #17766 from NeQuissimus/gradle30

gradle: 2.14.1 -> 3.0, keep 2.14.1
This commit is contained in:
Joachim F 2016-08-23 16:22:05 +02:00 committed by GitHub
commit 56bfc0240e
2 changed files with 14 additions and 4 deletions

View File

@ -51,7 +51,16 @@ rec {
}; };
}; };
gradleLatest = gradleGen rec { gradle_latest = gradleGen rec {
name = "gradle-3.0";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "103z2nzlpc6x3mav0mqardd84rj1si718f6wpnpl8i273aa0dj9r";
};
};
gradle_2_14 = gradleGen rec {
name = "gradle-2.14.1"; name = "gradle-2.14.1";
src = fetchurl { src = fetchurl {
@ -60,7 +69,7 @@ rec {
}; };
}; };
gradle25 = gradleGen rec { gradle_2_5 = gradleGen rec {
name = "gradle-2.5"; name = "gradle-2.5";
src = fetchurl { src = fetchurl {

View File

@ -6455,8 +6455,9 @@ in
gotty = callPackage ../servers/gotty { }; gotty = callPackage ../servers/gotty { };
gradleGen = callPackage ../development/tools/build-managers/gradle { }; gradleGen = callPackage ../development/tools/build-managers/gradle { };
gradle = self.gradleGen.gradleLatest; gradle = self.gradleGen.gradle_latest;
gradle25 = self.gradleGen.gradle25; gradle_2_14 = self.gradleGen.gradle_2_14;
gradle_2_5 = self.gradleGen.gradle_2_5;
gperf = callPackage ../development/tools/misc/gperf { }; gperf = callPackage ../development/tools/misc/gperf { };