Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

4 files changed, 38 insertions, 38 deletions

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
deleted file mode 100644
index a44a6d6c6c4..00000000000
--- a/pkgs/development/web/iojs/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv }:
-
-let
-  version = "3.1.0";
-  inherit (stdenv.lib) optional maintainers licenses platforms;
-in stdenv.mkDerivation {
-  name = "iojs-${version}";
-
-  src = fetchurl {
-    url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "15qh5pscg3588hyf4yfhma34gjkg87v5i4xzxj804g6m52m6y727";
-  };
-
-  prePatch = ''
-    sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
-  '';
-
-  configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ];
-
-  # iojs has --enable-static but no --disable-static. Automatically adding --disable-static
-  # causes configure to fail, so don't add --disable-static.
-  dontDisableStatic = true;
-
-  buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
-  setupHook = ../nodejs/setup-hook.sh;
-
-  passthru.interpreterName = "iojs";
-
-  meta = {
-    description = "A friendly fork of Node.js with an open governance model";
-    homepage = https://iojs.org/;
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.havvy ];
-  };
-}
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 361fbf6bf4c..38da99a3819 100644
--- 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 = "4.1.0";
+  version = "4.2.2";
 
   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 = "453005f64ee529f7dcf1237eb27ee2fa2415c49f5c9e7463e8b71fba61c5b408";
+    sha256 = "1c8c45b39fg2mz1c88jl0q0yhpxixdr25rpmpfskdd1m6hshkrq0";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
index 47de2e72d40..a5ee621de34 100644
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -56,6 +56,13 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  postFixup = ''
+    pushd $out/lib/node_modules/npm/node_modules/node-gyp
+    patch -p2 < ${./no-xcode.patch}
+    popd
+    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
+  '';
+
   passthru.interpreterName = "nodejs-0.10";
 
   meta = {
diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
new file mode 100644
index 00000000000..633d3086256
--- /dev/null
+++ b/pkgs/development/web/valum/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala, ctpl
+, libgee, libsoup, fcgi }:
+
+stdenv.mkDerivation rec {
+  name = "valum-${version}";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "valum-framework";
+    repo = "valum";
+    rev = "v${version}";
+    sha256 = "1lciwqk4k9sf1hl4drl207g0ydlxl906kx9lx5fqhfb8gwcfqh2g";
+  };
+
+  buildInputs = [ python pkgconfig glib vala ctpl libgee libsoup fcgi ];
+
+  configurePhase = ''python waf configure --prefix=$out'';
+
+  buildPhase = ''python waf build'';
+
+  installPhase = ''python waf install'';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/valum-framework/valum;
+    description = "Web micro-framework written in Vala";
+    plaforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}