public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20447 from NeQuissimus/gradle_3_2

Browse Source 
gradle: 3.1 -> 3.2
This commit is contained in:
Tim Steinbach 2016-11-16 12:51:14 -05:00 committed by GitHub
commit 0c9f88ea3c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/tools/build-managers/gradle/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, unzip, jdk, makeWrapper }: { stdenv, fetchurl, unzip, jdk, makeWrapper }:
rec { rec {
gradleGen = {name, src} : stdenv.mkDerivation rec { gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec {
inherit name src; inherit name src nativeVersion;
dontBuild = true; dontBuild = true;
@ -21,10 +21,10 @@ rec {
let arch = if stdenv.is64bit then "amd64" else "i386"; in '' let arch = if stdenv.is64bit then "amd64" else "i386"; in ''
mkdir patching mkdir patching
pushd patching pushd patching
jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.11.jar jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
jar cf native-platform-linux-${arch}-0.11.jar . jar cf native-platform-linux-${arch}-${nativeVersion}.jar .
mv native-platform-linux-${arch}-0.11.jar $out/lib/gradle/lib/ mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/
popd popd
# The scanner doesn't pick up the runtime dependency in the jar. # The scanner doesn't pick up the runtime dependency in the jar.
@ -52,16 +52,18 @@ rec {
}; };
gradle_latest = gradleGen rec { gradle_latest = gradleGen rec {
name = "gradle-3.1"; name = "gradle-3.2";
nativeVersion = "0.11";
src = fetchurl { src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip"; url = "http://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "1z0h60w0wvdg2rlxg5izcbhnrzdmr3mdgs7p09cm4lr28d139pn7"; sha256 = "0d9911011hg0rsqs7r4fz1xjrx0h43qji8s7f0vw0v926xlb68ak";
}; };
}; };
gradle_2_14 = gradleGen rec { gradle_2_14 = gradleGen rec {
name = "gradle-2.14.1"; name = "gradle-2.14.1";
nativeVersion = "0.10";
src = fetchurl { src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip"; url = "http://services.gradle.org/distributions/${name}-bin.zip";
@ -71,6 +73,7 @@ rec {
gradle_2_5 = gradleGen rec { gradle_2_5 = gradleGen rec {
name = "gradle-2.5"; name = "gradle-2.5";
nativeVersion = "0.10";
src = fetchurl { src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip"; url = "http://services.gradle.org/distributions/${name}-bin.zip";