Merge branch 'master.upstream' into staging.upstream

6 files changed, 31 insertions, 25 deletions

diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index 3b9d4d39118..82cf23e8be4 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
 
 let
-  version = "4.9.0.1";
+  version = "4.10.0";
   platform = with stdenv;
     if isDarwin then "macosx"
     else if isCygwin then "cygwin"
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   binaryVersion = 7;
 
   src = fetchurl {
-    url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz";
-    sha256 = "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4";
+    url = "http://code.call-cc.org/releases/4.10.0/chicken-${version}.tar.gz";
+    sha256 = "16w96jrhb6qf62fgznk53f55yhfv81damghdjn31k5hirnmza1qf";
   };
 
   setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 4a056e61de9..51e19614ddd 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -45,14 +45,14 @@ let
               buildTools = drv.buildTools or [] ++ [ self.elm-make ];
               patches = [ (fetchpatch {
                 url = "https://github.com/elm-lang/elm-reactor/commit/ca4d91d3fc7c6f72aa802d79fd1563ab5f3c4f2c.patch";
-                sha256 = "1msq7rvjid27m11lwcz9r1vyczlk7bfknyywqln300c8bgqyl45j";
+                sha256 = "0cjcv5rvrq7v1j8n8w87ljgza522cm32cy4n4rq5ysjq3qnaxwcq";
               }) ];
               preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix);
             });
 
             elm-package = hlib.appendPatch elmPkgs'.elm-package (fetchpatch {
               url = "https://github.com/elm-lang/elm-package/commit/af517f2ffe15f8ec1d8c38f01ce188bbdefea47a.patch";
-              sha256 = "0yq5vawmp9qq5w6qfy12r32ahpvccra749pnhg0zdykrj369m8a8";
+              sha256 = "1l66i4qssp0mcq8yypcn1ps3n2bskyfiqf0qr8gan6wz3znafpy9";
             });
 
             elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: {
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 95f58b7322d..f76719a3117 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -28,7 +28,7 @@
 , jailbreak ? false
 , license
 , maintainers ? []
-, doHaddock ? true
+, doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8"
 , passthru ? {}
 , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
 , platforms ? ghc.meta.platforms
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 1494092fc47..03558817fce 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,23 +1,27 @@
 { stdenv, fetchurl }:
 
-let version = "4.10.8"; in
+let version = "4.10.9"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15";
+    sha256 = "4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881";
   };
 
-  preConfigure = "cd nspr";
+  preConfigure = ''
+    cd nspr
+  '';
 
-  configureFlags = "--enable-optimize --disable-debug ${if stdenv.is64bit then "--enable-64bit" else ""}";
+  configureFlags = [
+    "--enable-optimize"
+    "--disable-debug"
+  ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit";
 
-  postInstall =
-    ''
-      find $out -name "*.a" | xargs rm
-    '';
+  postInstall = ''
+    find $out -name "*.a" -delete
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 5c73f5db26f..0a25e24fc54 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.19.3";
+  version = "3.20";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_3_RTM/src/${name}.tar.gz";
-    sha256 = "c56bdad20736a8227afb3c97b25d6d2eb3982e979ddc9be1d66cb7199ae8ca8f";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_RTM/src/${name}.tar.gz";
+    sha256 = "5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index a35816e2511..5fd7be063f5 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -3,11 +3,13 @@ let
   s = # Generated upstream information
   rec {
     baseName="slimerjs";
-    version="0.9.6";
+    version="0.9.6.2015.08.20";
     name="${baseName}-${version}";
     hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq";
-    url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip";
-    sha256="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq";
+    #url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip";
+    url = "https://github.com/laurentj/slimerjs.git";
+    rev = "87e0ff1d666897754a914131d8f1744195ee4d7a";
+    sha256="0ifgr8pi40id7vcv8ipc754bys22bhij0kkhd691285x19f52alc";
   };
   buildInputs = [
     unzip zip
@@ -16,12 +18,12 @@ in
 stdenv.mkDerivation {
   inherit (s) name version;
   inherit buildInputs;
-   src = fetchurl {
-     inherit (s) url sha256;
-   };
-  #src = fetchgit {
-  #  inherit (s) url sha256 rev;
+  #src = fetchurl {
+  #  inherit (s) url sha256;
   #};
+  src = fetchgit {
+    inherit (s) url sha256 rev;
+  };
   preConfigure = ''
     test -d src && cd src
     test -f omni.ja || zip omni.ja -r */