Merge branch 'master' into x-updates

Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).

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

@@ -0,0 +1,27 @@
+{ 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/haskell/cabal2ghci/default.nix

@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     Cabal cmdargs stylishHaskell systemFileio systemFilepath text
     unorderedContainers yaml
   ];
+  jailbreak = true;
   meta = {
     description = "A tool to generate .ghci file from .cabal";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/tools/haskell/cabal2nix/default.nix

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.49";
-  sha256 = "1zrxgaw1lqnnyk4xd0skdc72yq3xfx3vfg1sfgrs3235njraa20i";
+  version = "1.51";
+  sha256 = "0la1bhdxrzn1phjyca7h54vimwf4jy5ryclwrnivbcxkncrk9lig";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Convert Cabal files into Nix build instructions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/tools/neoload/default.nix

@@ -31,15 +31,15 @@ let dotInstall4j = writeTextFile { name = "dot-install4j"; text = ''
     ''; };
 
 in stdenv.mkDerivation rec {
-  name = "neoload-4.1.2";
+  name = "neoload-4.1.3";
 
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then
-      { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_2_linux_x64.sh;
-        sha256 = "10r1dg2a37lhimy9r9sax01ljp09cas9irfygc7qa0g15hll1s84"; }
+      { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_3_linux_x64.sh;
+        sha256 = "0qqp7iy6xpaqg535hk21yqmxi0inin5v160sa7nwxh41dq0li5xx"; }
     else
-      { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_2_linux_x86.sh;
-        sha256 = "00b2qf5jx9na4n6c7fv7v7r59w1iwm8sfmz1gb5ljqa1s7sa777a"; } );
+      { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_3_linux_x86.sh;
+        sha256 = "0rvy6l9znha3wf8cn406lwvv2qshqnls9kasi68r4wgysr1hh662"; } );
 
   buildInputs = [ makeWrapper ];
   phases = [ "installPhase" ];