public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs: 0.12.7 -> 4.1.0 

A big version jump after io.js merge.

dontDisableStatic flag is added since the ./configure script didn't
recognize "--disable-static" flag added by default.

New dependencies are also introduced, coming from io.js
This commit is contained in:
Utku Demir 2015-09-19 13:35:59 +00:00
parent 1f5f472a8a
commit 3733c25227
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/web/nodejs/default.nix
View File

@ -7,7 +7,7 @@
assert stdenv.system != "armv5tel-linux";
let
version = "0.12.7";
version = "4.1.0";
deps = {
inherit openssl zlib libuv;
@ -31,18 +31,18 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "17gk29zbw58l0sjjfw86acp39pkiblnq0gsq1jdrd70w0pgn8gdj";
sha256 = "453005f64ee529f7dcf1237eb27ee2fa2415c49f5c9e7463e8b71fba61c5b408";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
dontDisableStatic = true;
prePatch = ''
patchShebangs .
'';
patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch;
buildInputs = [ python which ]
buildInputs = [ python which http-parser zlib libuv openssl python ]
++ (optional stdenv.isLinux utillinux)
++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
setupHook = ./setup-hook.sh;

9
pkgs/top-level/all-packages.nix
View File

@ -2008,8 +2008,9 @@ let
ninka = callPackage ../development/tools/misc/ninka { };
nodejs-0_12 = callPackage ../development/web/nodejs {
nodejs-4_1 = callPackage ../development/web/nodejs {
libuv = libuvVersions.v1_6_1;
openssl = openssl_1_0_2;
};
nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
@ -2019,16 +2020,16 @@ let
nodejs = if stdenv.system == "armv5tel-linux" then
nodejs-0_10
else
nodejs-0_12;
nodejs-4_1;
nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_12; };
nodePackages_4_1 = callPackage ./node-packages.nix { self = nodePackages_4_1; nodejs = nodejs-4_1; };
nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
nodePackages = if stdenv.system == "armv5tel-linux" then
nodePackages_0_10
else
nodePackages_0_12;
nodePackages_4_1;
iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_6_1; };