Merge staging into closure-size

The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
parent bdbbfa0d42 b809f886c0
commit 333d69a5f0
1278 changed files with 105731 additions and 30012 deletions
@@ -2,7 +2,7 @@

 assert jdk != null;

-let version = "3.2.5"; in
+let version = "3.3.3"; in
 stdenv.mkDerivation rec {
  name = "apache-maven-${version}";

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
-    sha256 = "0md7fizam2lvl0b7fdlfjng6ywm283chmp382agzz4gmpmj046cc";
+    sha256 = "0ya71kxx0isvdnxz3n0rcynlgjah06mvp5r039x61wxr5ahw939s";
  };

  buildInputs = [ makeWrapper ];
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
 , cmake, zlib }:

-with ((import ./common.nix) { inherit stdenv; version = "0.5.0"; });
+with ((import ./common.nix) { inherit stdenv; version = "0.6.0"; });

 with rustPlatform;

@@ -12,10 +12,10 @@ buildRustPackage rec {
  src = fetchgit {
    url = "git://github.com/rust-lang/cargo";
    rev = "refs/tags/${version}";
-    sha256 = "1wg7vr6fpk9n76ly65lf2z9w1dj5nhykffbwrv46lybd8m3r8x3w";
+    sha256 = "1kxri32sz9ygnf4wlbj7hc7q9p6hmm5xrb9zzkx23wzkzbcpyjyz";
  };

-  depsSha256 = "1q92q63g9pz7fy9fhx8y0kqarsshmzv1dq18ki3hdd7d5pcbczna";
+  depsSha256 = "1m045yywv67sx75idbsny59d3dzbqnhr07k41jial5n5zwp87mb9";

  buildInputs = [ file curl pkgconfig python openssl cmake zlib ];

@@ -10,8 +10,8 @@ assert wantPS -> (ps != null);

 let
  os = stdenv.lib.optionalString;
-  majorVersion = "3.3";
-  minorVersion = "2";
+  majorVersion = "3.4";
+  minorVersion = "0";
  version = "${majorVersion}.${minorVersion}";
 in

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7";
+    sha256 = "1shwim3gfdybjx9f11ykxz5l09rh58vmvz8ip76q3i76mkv2pf55";
  };

  patches =
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "make-${version}";
+  name = "gnustep-make-${version}";
  version = "1.0";

  src = fetchurl {
@@ -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;
+  };
+}
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, jdk, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "gradle-2.6";
+  name = "gradle-2.8";

  src = fetchurl {
    url = "http://services.gradle.org/distributions/${name}-bin.zip";
-    sha256 = "10ww9vqyi5jkdw5bna14y63fjfhh40n81q7qsfhdycgj19b8ra8q";
+    sha256 = "1jq3m6ihvcxyp37mwsg3i8li9hd6rpv8ri8ih2mgvph4y71bk3d8";
  };

  installPhase = ''
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:

-let version = "7.22.01"; in
+let version = "7.23.02"; in
 stdenv.mkDerivation {
  name = "icmake-${version}";

  src = fetchFromGitHub {
-    sha256 = "1pgl8bami4v86ja40in4fsdx940f6q85l1s4b9k53zl29pm85v5k";
+    sha256 = "0gp2f8bw9i7vccsbz878mri0k6fls2x8hklbbr6mayag397gr928";
    rev = version;
    repo = "icmake";
    owner = "fbb-git";
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, ninja, python3 }:
+
+stdenv.mkDerivation rec {
+  name = "meson-0.26.0";
+
+  src = fetchurl {
+    url = "https://github.com/jpakkane/meson/archive/0.26.0.tar.gz";
+    sha256 = "1hmfn1bkxnwsnlhw6x9ryfcm4zwsf2w7h51cll1xrxg1rq08fvck";
+  };
+
+  buildInputs = [ ninja python3 ];
+
+  installPhase = ''
+    ./install_meson.py --prefix=$out --destdir="$pkgdir/"
+  '';
+
+  meta = {
+    homepage = "http://mesonbuild.com";
+    description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.mbe ];
+  };
+}
@@ -5,22 +5,18 @@ stdenv.mkDerivation rec {
  version = "0.13.9";

  src = fetchurl {
-    url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar";
-    sha256 = "04k411gcrq35ayd2xj79bcshczslyqkicwvhkf07hkyr4j3blxda";
+    url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
+    sha256 = "148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504";
  };

-  phases = [ "installPhase" ];
+  patchPhase = ''
+    echo -java-home ${jre.home} >>conf/sbtopts
+  '';

  installPhase = ''
-    mkdir -p $out/bin
-    cat > $out/bin/sbt << EOF
-    #! ${stdenv.shell}
-    if [ ! -v JAVA_HOME ]; then
-        export JAVA_HOME="${jre.home}"
-    fi
-    ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
-    EOF
-    chmod +x $out/bin/sbt
+    mkdir -p $out/share/sbt $out/bin
+    cp -ra . $out/share/sbt
+    ln -s $out/share/sbt/bin/sbt $out/bin/
  '';

  meta = {