Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00
parent d253b3d875 7e3c95a0b8
commit 333f145d76
178 changed files with 2917 additions and 1932 deletions
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";

 let
-  version = "0.12.6";
+  version = "0.12.7";

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

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

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