Merge recent master into staging

Hydra nixpkgs: ?compare=1156478

pkgs/development/web/nodejs/default.nix

@@ -10,12 +10,14 @@ let
 
   # !!! Should we also do shared libuv?
   deps = {
-    inherit openssl zlib http-parser;
+    inherit openssl zlib;
     cares = c-ares;
 
     # disabled system v8 because v8 3.14 no longer receives security fixes
     # we fall back to nodejs' internal v8 copy which receives backports for now
     # inherit v8
+  } // stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
+    inherit http-parser;
   };
 
   sharedConfigureFlags = name: [