diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2014-11-09 18:18:45 +0300 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2014-11-09 18:18:56 +0300 |
commit | 0fb2c3e85a1161fa3232ead33192176cd5859484 (patch) | |
tree | da59994b6297b67e9d27dfc3884bc1f6c0fec69f | |
parent | 3d2f1c3385e0c6b101f052eadc34f8c7cdb4cb0b (diff) | |
download | nixlib-0fb2c3e85a1161fa3232ead33192176cd5859484.tar nixlib-0fb2c3e85a1161fa3232ead33192176cd5859484.tar.gz nixlib-0fb2c3e85a1161fa3232ead33192176cd5859484.tar.bz2 nixlib-0fb2c3e85a1161fa3232ead33192176cd5859484.tar.lz nixlib-0fb2c3e85a1161fa3232ead33192176cd5859484.tar.xz nixlib-0fb2c3e85a1161fa3232ead33192176cd5859484.tar.zst nixlib-0fb2c3e85a1161fa3232ead33192176cd5859484.zip |
Add unstable NodeJS — Fixes #4264 (mostly merges the PR from Bodil Stokke)
-rw-r--r-- | pkgs/development/web/nodejs/default.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 3356a04729ee..f796567b5556 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, v8, utillinux, http-parser, c-ares +, pkgconfig, runCommand, which, unstableVersion ? false +}: let dtrace = runCommand "dtrace-native" {} '' @@ -6,19 +8,20 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.32"; + version = if unstableVersion then "0.11.13" else "0.10.32"; # !!! Should we also do shared libuv? deps = { 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) { + } // (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}" @@ -32,7 +35,9 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "040g0gh2nl593ml1fcqp68vxa5kj7aiw1nqirda1c69d7l70s4n2"; + sha256 = if unstableVersion + then "1642zj3sajhqflfhb8fsvy84w9mm85wagm8w8300gydd2q6fkmhm" + else "040g0gh2nl593ml1fcqp68vxa5kj7aiw1nqirda1c69d7l70s4n2"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4067b63e85c..740e97bc7f58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1572,7 +1572,8 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs = callPackage ../development/web/nodejs {}; + nodejs = callPackage ../development/web/nodejs { }; + nodejs-unstable = callPackage ../development/web/nodejs { unstableVersion = true; }; nodePackages = recurseIntoAttrs (import ./node-packages.nix { inherit pkgs stdenv nodejs fetchurl fetchgit; |