Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-04-07 21:52:26 +00:00
parent a73a28de7b 25cc1c12fe
commit 3e68106afd
198 changed files with 32102 additions and 27617 deletions
@@ -6,7 +6,7 @@
 assert stdenv.system != "armv5tel-linux";

 let
-  version = "5.10.0";
+  version = "5.10.1";

  deps = {
    inherit openssl zlib libuv;
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {

  src = fetchurl {
    url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0avn25j04q172ri8mksrryyg4g95k7x2pqzsbmp1nr6ybfpvkblg";
+    sha256 = "1kdaahq3h89c7mz2qbqx43qdigsswl1i8ll5vw6j8g5m2av7iqn6";
  };

  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];