Merge branch 'master' into staging-next

Hydra: ?compare=1468896
2018-07-14 18:12:49 +02:00
parent 4bd4e3ef5c 6d0578934f
commit 0f01215203
721 changed files with 20508 additions and 20874 deletions
--- a/pkgs/development/web/nodejs/v9.nix
+++ b/pkgs/development/web/nodejs/v9.nix
@@ -1,11 +0,0 @@
-{ stdenv, callPackage, lib, enableNpm ? true }:
-
-let
-  buildNodejs = callPackage ./nodejs.nix {};
-in
-  buildNodejs {
-    inherit enableNpm;
-    version = "9.11.2";
-    sha256 = "04y2dnbf6jl8j0ykfkdwhir09h274d13k843d7lqfz3bgyn4wj06";
-    patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
-  }