diff options
author | Ryan Scheel <Ryan.havvy@gmail.com> | 2015-02-17 22:44:58 -0800 |
---|---|---|
committer | Ryan Scheel <Ryan.havvy@gmail.com> | 2015-02-17 22:44:58 -0800 |
commit | ffc1a595e439f2b22cd21bc72671d28dc0ab8e1f (patch) | |
tree | 0ad7b9fa7e1c598d0f71ac2af3540b01f563d589 /pkgs/development/web | |
parent | ae0263f9607f955149d1bac9c0b5c840af4b4b97 (diff) | |
download | nixlib-ffc1a595e439f2b22cd21bc72671d28dc0ab8e1f.tar nixlib-ffc1a595e439f2b22cd21bc72671d28dc0ab8e1f.tar.gz nixlib-ffc1a595e439f2b22cd21bc72671d28dc0ab8e1f.tar.bz2 nixlib-ffc1a595e439f2b22cd21bc72671d28dc0ab8e1f.tar.lz nixlib-ffc1a595e439f2b22cd21bc72671d28dc0ab8e1f.tar.xz nixlib-ffc1a595e439f2b22cd21bc72671d28dc0ab8e1f.tar.zst nixlib-ffc1a595e439f2b22cd21bc72671d28dc0ab8e1f.zip |
Update Node stable to v.0.12.0
Patch is from ewemoa on IRC and claims it built successfully. User didn't want to create a Github account. Original patch is at https://pastee.org/zx45s
Diffstat (limited to 'pkgs/development/web')
-rw-r--r-- | pkgs/development/web/nodejs/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 06aeec77fbdf..27bb65ccbc7a 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares +{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser , pkgconfig, runCommand, which, unstableVersion ? false }: @@ -8,7 +8,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = if unstableVersion then "0.11.13" else "0.10.33"; + version = if unstableVersion then "0.11.13" else "0.12.0"; # !!! Should we also do shared libuv? deps = { @@ -19,9 +19,7 @@ let # inherit v8 } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { inherit http-parser; - }) - # Node 0.11 has patched c-ares, won't compile with system's version - // (if unstableVersion then {} else { cares = c-ares; }); + }); sharedConfigureFlags = name: [ "--shared-${name}" @@ -37,7 +35,7 @@ in stdenv.mkDerivation { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; sha256 = if unstableVersion then "1642zj3sajhqflfhb8fsvy84w9mm85wagm8w8300gydd2q6fkmhm" - else "07h8vl750svjg8x5zhxhwjkx03jpy2m6h3fbj7fd1rj4671jdp3m"; + else "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); |