Merge master into stdenv-updates

Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix

pkgs/development/tools/build-managers/gnumake-3.80/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "gnumake-3.80";
   src = fetchurl {
-    url = http://nixos.org/tarballs/make-3.80.tar.bz2;
+    url = http://tarballs.nixos.org/make-3.80.tar.bz2;
     md5 = "0bbd1df101bc0294d440471e50feca71";
   };
   patches = [./log.patch];

pkgs/development/tools/build-managers/mk/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mk-2006-01-31";
   src = fetchurl {
-    url = http://nixos.org/tarballs/mk-20060131.tar.gz;
+    url = http://tarballs.nixos.org/mk-20060131.tar.gz;
     md5 = "167fd4e0eea4f49def01984ec203289b";
   };
   builder = ./builder.sh;

pkgs/development/tools/build-managers/ninja/default.nix

@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, unzip, python, asciidoc, re2c }:
+{ stdenv, fetchurl, python, asciidoc, re2c }:
 
 stdenv.mkDerivation rec {
   name = "ninja-${version}";
-  version = "1.2.0";
+  version = "1.3.4";
 
   src = fetchurl {
-    name = "${name}.zip";
-    url = "https://github.com/martine/ninja/archive/v${version}.zip";
-    sha256 = "15ynh806ah37bqb57hcs3mj2g82900sncp6n3bssfggb4azgjlh3";
+    name = "${name}.tar.gz";
+    url = "https://github.com/martine/ninja/archive/v${version}.tar.gz";
+    sha256 = "16b0dxq3v19qjchcmfqq3m4l8s4qx2d674vfvamg0s3vvfqnc477";
   };
 
-  buildInputs = [ python asciidoc unzip re2c ];
+  buildInputs = [ python asciidoc re2c ];
 
   buildPhase = ''
     python bootstrap.py

pkgs/development/tools/build-managers/remake/default.nix

@@ -1,15 +1,21 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, readline }:
+
+stdenv.mkDerivation rec {
+  name = "remake-${version}";
+  version = "3.82+dbg-0.6";
 
-stdenv.mkDerivation {
-  name = "remake-3.81-dbg-0.2";
   src = fetchurl {
-    url = mirror://sourceforge/bashdb/remake-3.81+dbg-0.2.tar.gz;
-    sha256 = "0mhc06zgd39dl8rk16ii0m2x22b9zi67d48km7rn0fzzv519lmwc";
+    url = "mirror://sourceforge/project/bashdb/remake/${version}/${name}.tar.bz2";
+    sha256 = "0i2g6vi9zya78d9zpigfnmzg2qcl93myjfibh3kfmjk7b9lajfyz";
   };
 
+  buildInputs = [ readline ];
+
   meta = {
     homepage = http://bashdb.sourceforge.net/remake/;
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl3;
     description = "GNU Make with comprehensible tracing and a debugger";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ bjornfor ];
   };
 }

pkgs/development/tools/build-managers/sbt/default.nix

@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, writeScript, bash, jre }:
-
-let 
-
-  sbt = writeScript "sbt.sh" ''
-    #!${bash}/bin/bash
-    ${jre}/bin/java -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled \
-      -XX:MaxPermSize=384M -jar @out@/lib/sbt-launch.jar "$@"
-  '';
-
-in stdenv.mkDerivation rec {
-  name = "sbt-${version}";
-
-  version = "0.12.3";
-
-  src = fetchurl {
-    url = "http://scalasbt.artifactoryonline.com/scalasbt/sbt-native-packages/org/scala-sbt/sbt/${version}/sbt.tgz";
-    sha256 = "154ydaxd6ink5sy4flzpyh47nnhgkxwpzmml8q16am7655fpib08";
-  };
-
-  installPhase = ''
-    mkdir -p $out/lib $out/bin
-    mv bin/sbt-launch.jar $out/lib/
-    cp ${sbt} $out/bin/sbt
-    substituteInPlace $out/bin/sbt --replace @out@ $out
-  '';
-}

pkgs/development/tools/build-managers/simple-build-tool/default.nix

@@ -66,8 +66,8 @@ versionedDerivation "simple-build-tool" version {
   "xsbt-0.12.3" = let version = "0.12.3"; in {
     name = "xsbt-${version}";
 
-    # scala needs much more PermGen space
-    javaArgs = "-Xmx1024M";
+    # Recommended java options from sbt Getting started guide
+    javaArgs = "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M";
     # from https://github.com/harrah/xsbt/wiki/Getting-Started-Setup
     src = fetchurl {
       url = http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.3/sbt-launch.jar;