diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
commit | a26c8e9b835647ae39d4259cfd55e8001ee57b93 (patch) | |
tree | 55fe17fed5fc7625146a47e7f0e14b6581c18473 /pkgs/development/tools | |
parent | fa5ad20922cbc2b4ffbbb74edbc22d650d80441d (diff) | |
parent | 9fd510e95ad8dd2d0e4c92f12fd9249594c30f23 (diff) | |
download | nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.gz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.bz2 nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.lz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.xz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.zst nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/build-managers/gnustep/make/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/gradle/2.5.nix | 39 | ||||
-rw-r--r-- | pkgs/development/tools/jq/default.nix | 3 |
3 files changed, 42 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix index 7fa9aad72dbe..67fe60f2c0eb 100644 --- a/pkgs/development/tools/build-managers/gnustep/make/default.nix +++ b/pkgs/development/tools/build-managers/gnustep/make/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "make-${version}"; + name = "gnustep-make-${version}"; version = "1.0"; src = fetchurl { diff --git a/pkgs/development/tools/build-managers/gradle/2.5.nix b/pkgs/development/tools/build-managers/gradle/2.5.nix new file mode 100644 index 000000000000..b140a07609e4 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/2.5.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, unzip, jdk, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gradle-2.5"; + + src = fetchurl { + url = "http://services.gradle.org/distributions/${name}-bin.zip"; + sha256 = "0mc5lf6phkncx77r0papzmfvyiqm0y26x50ipvmzkcsbn463x59z"; + }; + + installPhase = '' + mkdir -pv $out/gradle + cp -rv lib $out/gradle + + gradle_launcher_jar=$(echo $out/gradle/lib/gradle-launcher-*.jar) + test -f $gradle_launcher_jar + makeWrapper ${jdk}/bin/java $out/bin/gradle \ + --set JAVA_HOME ${jdk} \ + --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain" + ''; + + phases = "unpackPhase installPhase"; + + buildInputs = [ unzip jdk makeWrapper ]; + + meta = { + description = "Enterprise-grade build system"; + longDescription = '' + Gradle is a build system which offers you ease, power and freedom. + You can choose the balance for yourself. It has powerful multi-project + build support. It has a layer on top of Ivy that provides a + build-by-convention integration for Ivy. It gives you always the choice + between the flexibility of Ant and the convenience of a + build-by-convention behavior. + ''; + homepage = http://www.gradle.org/; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 61c4a498c6d6..c509af871247 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, oniguruma}: let s = # Generated upstream information rec { @@ -9,6 +9,7 @@ let sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"; }; buildInputs = [ + oniguruma ]; in stdenv.mkDerivation { |