Merge branch 'master' into staging

2016-05-12 04:03:33 +02:00
parent 81df035429 3d932ba135
commit 6c2fbfbd77
222 changed files with 17737 additions and 11667 deletions
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -4,9 +4,9 @@
 }@args:

 import ./nodejs.nix (args // rec {
-  version = "6.0.0";
+  version = "6.1.0";
  src = fetchurl {
    url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.gz";
-    sha256 = "0cpw7ng193jgfbw2g1fd0kcglmjjkbj4xb89g00z8zz0lj0nvdbd";
+    sha256 = "1hsbmr3yc6zmyhz058zfxg77dzjhk94g1k0y65p6xq8ihq5yyrwy";
  };
 })