Merge pull request #17169 from holidaycheck/nodejs-6.3.1

nodejs-6_x: 6.2.2 -> 6.3.1

Changed files
+20 -13
pkgs
development
web
+10 -6
pkgs/development/web/nodejs/nodejs.nix
···
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool
, version
-
, src
, preBuild ? ""
, ...
}:
···
let
-
deps = {
-
inherit openssl zlib libuv;
} // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
inherit http-parser;
});
···
name = "nodejs-${version}";
-
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
dontDisableStatic = true;
prePatch = ''
patchShebangs .
···
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
-
buildInputs = [ python which zlib libuv openssl python ]
++ optionals stdenv.isLinux [ utillinux http-parser ]
-
++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
setupHook = ./setup-hook.sh;
enableParallelBuilding = true;
···
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool
, version
+
, sha256 ? null
+
, src ? fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; inherit sha256; }
, preBuild ? ""
+
, extraConfigFlags ? []
+
, extraBuildInputs ? []
, ...
}:
···
let
+
deps = {
+
inherit openssl zlib libuv;
} // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
inherit http-parser;
});
···
name = "nodejs-${version}";
+
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ] ++ extraConfigFlags;
dontDisableStatic = true;
prePatch = ''
patchShebangs .
···
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
+
buildInputs = extraBuildInputs
+
++ [ python which zlib libuv openssl ]
++ optionals stdenv.isLinux [ utillinux http-parser ]
+
++ optionals stdenv.isDarwin [ pkgconfig libtool ];
setupHook = ./setup-hook.sh;
enableParallelBuilding = true;
+10 -7
pkgs/development/web/nodejs/v6.nix
···
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool
, callPackage
}@args:
-
import ./nodejs.nix (args // rec {
-
version = "6.2.2";
-
src = fetchurl {
-
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-
sha256 = "2dfeeddba750b52a528b38a1c31e35c1fb40b19cf28fbf430c3c8c7a6517005a";
-
};
-
preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
sed -i -e "s|tr1/type_traits|type_traits|g" \
-e "s|std::tr1|std|" src/util.h
'';
···
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool
, callPackage
+
, darwin ? null
}@args:
+
let
+
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+
+
in import ./nodejs.nix (args // rec {
+
version = "6.3.1";
+
sha256 = "06ran2ccfxkwyk6w4wikd7qws286952lbx93pqaygmbh9f0q9rbg";
+
extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin
+
[ CoreServices ApplicationServices ];
+
preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i -e "s|tr1/type_traits|type_traits|g" \
-e "s|std::tr1|std|" src/util.h
'';