Merge branch 'master' into staging-next

Hydra: ?compare=1468896

pkgs/development/web/kcgi/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "kcgi";
-  version = "0.10.6";
+  version = "0.10.7";
   underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
   name = "${pname}-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "kristapsdz";
     repo = pname;
     rev = "VERSION_${underscoreVersion}";
-    sha256 = "0vaqz7krlvkjlc0189pkcj1al1p5ic577dn6bb4ivca1bss1i3m2";
+    sha256 = "1z8gfj1v69hhkiyybr41qw7yv3cdxahgk45nipxfb9nmn18p0k8n";
   };
   patchPhase = ''substituteInPlace configure \
     --replace /usr/local /

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 ];
-  }