From 6654b8274e60593a1b5fc4e60a3d97f262c266ba Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 16 Aug 2016 00:03:18 +0000 Subject: [PATCH] gradle: 2.14.1 -> 3.0, keep 2.14.1 --- .../tools/build-managers/gradle/default.nix | 13 +++++++++++-- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 07cdf3fbd6d1..86058e03e413 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -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"; src = fetchurl { @@ -60,7 +69,7 @@ rec { }; }; - gradle25 = gradleGen rec { + gradle_2_5 = gradleGen rec { name = "gradle-2.5"; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 796400d3568e..3ed1f617c710 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6453,8 +6453,9 @@ in gotty = callPackage ../servers/gotty { }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; - gradle = self.gradleGen.gradleLatest; - gradle25 = self.gradleGen.gradle25; + gradle = self.gradleGen.gradle_latest; + gradle_2_14 = self.gradleGen.gradle_2_14; + gradle_2_5 = self.gradleGen.gradle_2_5; gperf = callPackage ../development/tools/misc/gperf { };