From 91212771446ef0fd87f6460855ce4825937d091b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 21 Dec 2015 03:14:24 +0000 Subject: [PATCH] gradle: 2.8 -> 2.9 --- pkgs/development/tools/build-managers/gradle/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index bee95d67ec3..e451370c9eb 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -34,12 +34,12 @@ rec { }; }; - gradle28 = gradleGen rec { - name = "gradle-2.8"; + gradleLatest = gradleGen rec { + name = "gradle-2.9"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1jq3m6ihvcxyp37mwsg3i8li9hd6rpv8ri8ih2mgvph4y71bk3d8"; + sha256 = "c9159ec4362284c0a38d73237e224deae6139cbde0db4f0f44e1c7691dd3de2f"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57026762d1b..737888cc979 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1809,7 +1809,7 @@ let pgf_graphics = callPackage ../tools/graphics/pgf { }; pigz = callPackage ../tools/compression/pigz { }; - + pixz = callPackage ../tools/compression/pixz { }; pxz = callPackage ../tools/compression/pxz { }; @@ -2985,7 +2985,7 @@ let samplicator = callPackage ../tools/networking/samplicator { }; - screen = callPackage ../tools/misc/screen { + screen = callPackage ../tools/misc/screen { inherit (darwin.apple_sdk.libs) utmp; }; @@ -5717,7 +5717,7 @@ let gotty = goPackages.gotty.bin // { outputs = [ "bin" ]; }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; - gradle = self.gradleGen.gradle28; + gradle = self.gradleGen.gradleLatest; gradle25 = self.gradleGen.gradle25; gperf = callPackage ../development/tools/misc/gperf { }; @@ -10300,7 +10300,7 @@ let gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; }; - kgocode = callPackage ../applications/misc/kgocode { + kgocode = callPackage ../applications/misc/kgocode { inherit (pkgs.kde4) kdelibs; };