Merge pull request #11853 from NeQuissimus/gradle29

gradle: 2.8 -> 2.9
This commit is contained in:
Arseniy Seroka 2015-12-21 19:42:21 +03:00
commit 0cd13e6b7b
2 changed files with 7 additions and 7 deletions

View File

@ -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";
};
};

View File

@ -1811,7 +1811,7 @@ let
pgf_graphics = callPackage ../tools/graphics/pgf { };
pigz = callPackage ../tools/compression/pigz { };
pixz = callPackage ../tools/compression/pixz { };
pxz = callPackage ../tools/compression/pxz { };
@ -2989,7 +2989,7 @@ let
samplicator = callPackage ../tools/networking/samplicator { };
screen = callPackage ../tools/misc/screen {
screen = callPackage ../tools/misc/screen {
inherit (darwin.apple_sdk.libs) utmp;
};
@ -5721,7 +5721,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 { };
@ -10306,7 +10306,7 @@ let
gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; };
kgocode = callPackage ../applications/misc/kgocode {
kgocode = callPackage ../applications/misc/kgocode {
inherit (pkgs.kde4) kdelibs;
};