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

Merge pull request #6513 from valeriangalliat/nodejs-iojs-libuv-shared

Browse Source 
Shared libuv in io.js and Node.js
This commit is contained in:
lethalman 2015-02-23 11:10:05 +01:00
commit ff98a8c24c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/libuv/default.nix
View File

@ -105,4 +105,5 @@ in
// //
mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) { mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx"; v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
v1_4_0 = "17k028gn07vb9in440wbf0ar0rdl8bi5v4shm8nhj22vfb18dhl5";
} }

6
pkgs/development/web/iojs/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, nightly ? false }: { stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }:
let let
version = if nightly then "1.2.1-nightly201502201bf91878e7" else "1.3.0"; version = if nightly then "1.2.1-nightly201502201bf91878e7" else "1.3.0";
@ -19,9 +19,9 @@ in stdenv.mkDerivation {
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
''; '';
configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" ]; configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ];
buildInputs = [ python openssl http-parser zlib ] ++ (optional stdenv.isLinux utillinux); buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
setupHook = ../nodejs/setup-hook.sh; setupHook = ../nodejs/setup-hook.sh;
meta = { meta = {

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, unstableVersion ? false , pkgconfig, runCommand, which, unstableVersion ? false
}: }:
@ -10,9 +10,8 @@ let
version = if unstableVersion then "0.11.13" else "0.12.0"; version = if unstableVersion then "0.11.13" else "0.12.0";
# !!! Should we also do shared libuv?
deps = { deps = {
inherit openssl zlib; inherit openssl zlib libuv;
# 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

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

@ -1724,15 +1724,15 @@ let
ninka = callPackage ../development/tools/misc/ninka { }; ninka = callPackage ../development/tools/misc/ninka { };
nodejs = callPackage ../development/web/nodejs { }; nodejs = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; };
nodejs-unstable = callPackage ../development/web/nodejs { unstableVersion = true; }; nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
nodePackages = recurseIntoAttrs ( nodePackages = recurseIntoAttrs (
callPackage ./node-packages.nix { self = nodePackages; } callPackage ./node-packages.nix { self = nodePackages; }
); );
iojs = callPackage ../development/web/iojs { }; iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; };
iojs-nightly = callPackage ../development/web/iojs { nightly = true; }; iojs-nightly = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; nightly = true; };
iojsPackages = recurseIntoAttrs ( iojsPackages = recurseIntoAttrs (
callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; } callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }