BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add unstable NodeJS — Fixes #4264 (mostly merges the PR from Bodil Stokke)

Browse source
This commit is contained in:
Michael Raskin 2014-11-09 18:18:45 +03:00
parent 3d2f1c3385
commit 0fb2c3e85a
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/web/nodejs/default.nix
View file

@ -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 let
dtrace = runCommand "dtrace-native" {} '' dtrace = runCommand "dtrace-native" {} ''
@ -6,19 +8,20 @@ let
ln -sv /usr/sbin/dtrace $out/bin 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? # !!! Should we also do shared libuv?
deps = { deps = {
inherit openssl zlib; inherit openssl zlib;
cares = c-ares;
# disabled system v8 because v8 3.14 no longer receives security fixes # 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 # we fall back to nodejs' internal v8 copy which receives backports for now
# inherit v8 # inherit v8
} // stdenv.lib.optionalAttrs (!stdenv.isDarwin) { } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
inherit http-parser; 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: [ sharedConfigureFlags = name: [
"--shared-${name}" "--shared-${name}"
@ -32,7 +35,9 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; 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); configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);

3
pkgs/top-level/all-packages.nix
View file

@ -1572,7 +1572,8 @@ let
ninka = callPackage ../development/tools/misc/ninka { }; 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 { nodePackages = recurseIntoAttrs (import ./node-packages.nix {
inherit pkgs stdenv nodejs fetchurl fetchgit; inherit pkgs stdenv nodejs fetchurl fetchgit;