Merge pull request #17766 from NeQuissimus/gradle30

gradle: 2.14.1 -> 3.0, keep 2.14.1

authored by Joachim F and committed by GitHub 56bfc024 1df4dd6b

+14 -4
+11 -2
pkgs/development/tools/build-managers/gradle/default.nix
··· 51 51 }; 52 52 }; 53 53 54 - gradleLatest = gradleGen rec { 54 + gradle_latest = gradleGen rec { 55 + name = "gradle-3.0"; 56 + 57 + src = fetchurl { 58 + url = "http://services.gradle.org/distributions/${name}-bin.zip"; 59 + sha256 = "103z2nzlpc6x3mav0mqardd84rj1si718f6wpnpl8i273aa0dj9r"; 60 + }; 61 + }; 62 + 63 + gradle_2_14 = gradleGen rec { 55 64 name = "gradle-2.14.1"; 56 65 57 66 src = fetchurl { ··· 60 69 }; 61 70 }; 62 71 63 - gradle25 = gradleGen rec { 72 + gradle_2_5 = gradleGen rec { 64 73 name = "gradle-2.5"; 65 74 66 75 src = fetchurl {
+3 -2
pkgs/top-level/all-packages.nix
··· 6455 6455 gotty = callPackage ../servers/gotty { }; 6456 6456 6457 6457 gradleGen = callPackage ../development/tools/build-managers/gradle { }; 6458 - gradle = self.gradleGen.gradleLatest; 6459 - gradle25 = self.gradleGen.gradle25; 6458 + gradle = self.gradleGen.gradle_latest; 6459 + gradle_2_14 = self.gradleGen.gradle_2_14; 6460 + gradle_2_5 = self.gradleGen.gradle_2_5; 6460 6461 6461 6462 gperf = callPackage ../development/tools/misc/gperf { }; 6462 6463