From c9d27cc3ea6377b2e4b40110049a5e32e05a08ce Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Thu, 3 Nov 2016 00:21:44 +0100 Subject: [PATCH] nodejs-7_x: init --- pkgs/development/web/nodejs/v7.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/web/nodejs/v7.nix diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix new file mode 100644 index 000000000000..420f2b0412f0 --- /dev/null +++ b/pkgs/development/web/nodejs/v7.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool, fetchpatch +, callPackage +, darwin ? null +, enableNpm ? true +}@args: + +let + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "7.0.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; + sha256 = "16l9r91z4dxmgc01fs1y8jdh8xjnmyyrq60isyznnxfnq9v3qv71"; + }; + + patches = nodejs.patches ++ [ + (fetchpatch { + url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; + sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; + }) + ]; + + }) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc4660108d00..92d8e7594e47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2448,6 +2448,15 @@ in enableNpm = false; }; + nodejs-7_x = callPackage ../development/web/nodejs/v7.nix { + libtool = darwin.cctools; + }; + + nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix { + libtool = darwin.cctools; + enableNpm = false; + }; + nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; };