diff options
Diffstat (limited to 'pkgs/development/web/nodejs/default.nix')
| -rw-r--r-- | pkgs/development/web/nodejs/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 57968bfe8f4..c4126f0fb5f 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand, which }: +{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, unstableVersion ? false +}: let dtrace = runCommand "dtrace-native" {} '' @@ -6,17 +8,17 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.30"; + version = "0.12.0"; - # !!! Should we also do shared libuv? deps = { - inherit openssl zlib http-parser; - cares = c-ares; + inherit openssl zlib libuv; # 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: [ "--shared-${name}" @@ -30,7 +32,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1li5hs8dada2lj9j82xas39kr1fs0wql9qbly5p2cpszgwqbvz1x"; + sha256 = "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); @@ -50,6 +52,8 @@ in stdenv.mkDerivation { ++ optionals stdenv.isDarwin [ pkgconfig dtrace ]; setupHook = ./setup-hook.sh; + passthru.interpreterName = "nodejs"; + meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = http://nodejs.org; |