Merge branch 'master.upstream' into staging.upstream

pkgs/development/web/iojs/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.3.1";
+  version = "2.3.3";
   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 = "1vkahs7ky551gl52l8j8f2w8ajasjblqqmhird5ll87wccx8w6f2";
+    sha256 = "12fdz0as1sa34bq4a701qwrznpn7y1wq0yxlr5yw494ifchfm103";
   };
 
   prePatch = ''

pkgs/development/web/nodejs/default.nix

@@ -42,9 +42,6 @@ in stdenv.mkDerivation {
 
   patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null;
 
-  postPatch = if stdenv.isDarwin then ''
-    (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
-  '' else null;
 
   preBuild = if stdenv.isDarwin then ''
     patchShebangs .