From 087202abf9edcb931d5ffd94e0091db613407c64 Mon Sep 17 00:00:00 2001 From: "Ryan Scheel (Havvy)" Date: Fri, 13 Nov 2015 23:06:03 +0000 Subject: nodejs: 0.10.38 -> 0.10.40 --- pkgs/development/web/nodejs/v0_10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/web/nodejs') diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix index a5ee621de34a..eecc9338a6ae 100644 --- a/pkgs/development/web/nodejs/v0_10.nix +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -6,7 +6,7 @@ }: let - version = "0.10.38"; + version = "0.10.40"; # !!! Should we also do shared libuv? deps = { @@ -32,7 +32,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "12xpa9jzry5g0j41908498qqs8v0q6miqkv6mggyzas8bvnshgai"; + sha256 = "17qlk4adjk1ls8ka4gbmvcl02xmvxdxhfdmg54bbxbjrv4prrrxs"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ -- cgit 1.4.1 From a06dd213b6574bacafc08d48043c03afed92d8cb Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 16 Nov 2015 17:58:11 +0000 Subject: nodejs-5_0: add package --- pkgs/development/web/nodejs/v5_0.nix | 62 ++++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/web/nodejs/v5_0.nix (limited to 'pkgs/development/web/nodejs') diff --git a/pkgs/development/web/nodejs/v5_0.nix b/pkgs/development/web/nodejs/v5_0.nix new file mode 100644 index 000000000000..d83efdf2fa58 --- /dev/null +++ b/pkgs/development/web/nodejs/v5_0.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool +}: + +# nodejs 5.0.0 can't be built on armv5tel. Armv6 with FPU, minimum I think. +# Related post: http://zo0ok.com/techfindings/archives/1820 +assert stdenv.system != "armv5tel-linux"; + +let + version = "5.0.0"; + + deps = { + 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}" + "--shared-${name}-includes=${builtins.getAttr name deps}/include" + "--shared-${name}-libpath=${builtins.getAttr name deps}/lib" + ]; + + inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; +in stdenv.mkDerivation { + name = "nodejs-${version}"; + + src = fetchurl { + url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; + sha256 = "1x6dmk78k4cpdzvxi8390w2w0pvkb6bc1rc64l5a5rks0ri9d3b9"; + }; + + configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; + dontDisableStatic = true; + prePatch = '' + patchShebangs . + sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py + ''; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ]; + + buildInputs = [ python which zlib libuv openssl python ] + ++ optionals stdenv.isLinux [ utillinux http-parser ] + ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ]; + setupHook = ./setup-hook.sh; + + enableParallelBuilding = true; + + passthru.interpreterName = "nodejs"; + + meta = { + description = "Event-driven I/O framework for the V8 JavaScript engine"; + homepage = http://nodejs.org; + license = licenses.mit; + maintainers = [ maintainers.goibhniu maintainers.havvy ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39e35cfb3fa6..fde4953301c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2048,6 +2048,11 @@ let ninka = callPackage ../development/tools/misc/ninka { }; + nodejs-5_0 = callPackage ../development/web/nodejs/v5_0.nix { + libtool = darwin.cctools; + openssl = openssl_1_0_2; + }; + nodejs-4_2 = callPackage ../development/web/nodejs { libtool = darwin.cctools; openssl = openssl_1_0_2; -- cgit 1.4.1 From 5823ff2a927d56d325b0bb89bb186e44c9681c54 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Thu, 19 Nov 2015 22:32:43 +0100 Subject: nodejs: remove myself from the maintainers --- pkgs/development/web/nodejs/default.nix | 2 +- pkgs/development/web/nodejs/v0_10.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/development/web/nodejs') diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 05296149337b..d526cc7c7c4e 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = http://nodejs.org; license = licenses.mit; - maintainers = [ maintainers.goibhniu maintainers.havvy ]; + maintainers = [ maintainers.havvy ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix index eecc9338a6ae..6ee3c089d2c9 100644 --- a/pkgs/development/web/nodejs/v0_10.nix +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -69,7 +69,6 @@ in stdenv.mkDerivation { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = http://nodejs.org; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux ++ platforms.darwin; }; } -- cgit 1.4.1