diff options
Diffstat (limited to 'pkgs/development/web')
-rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 10 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v4.nix | 11 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v6.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v9.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/remarkjs/nodepkgs.nix | 4 |
5 files changed, 15 insertions, 18 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index eafaf956ee02..22eb772da1f9 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -26,6 +26,11 @@ let */ ]) (builtins.attrNames sharedLibDeps); + copyLibHeaders = + map + (name: "${getDev sharedLibDeps.${name}}/include/*") + (builtins.attrNames sharedLibDeps); + extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; in @@ -74,13 +79,16 @@ in mkdir -p $out/share/bash-completion/completions/ $out/bin/npm completion > $out/share/bash-completion/completions/npm ''} + + # install the missing headers for node-gyp + cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node ''; meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = https://nodejs.org; license = licenses.mit; - maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; + maintainers = with maintainers; [ goibhniu gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix deleted file mode 100644 index 64674066b295..000000000000 --- a/pkgs/development/web/nodejs/v4.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix {}; -in - buildNodejs { - inherit enableNpm; - version = "4.8.7"; - sha256 = "1y21wq092d3gmccm2zldbflbbbx7a71wi9l0bpkxvzmgws69liq3"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; - } diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 98952801c173..c2ca341751b5 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.12.3"; - sha256 = "1p6w7ngp95lc3ksyklp1mwyq1f02vz62r1h60g1ri00pl8pnfn0s"; + version = "6.13.0"; + sha256 = "012dpfqxsrmd3xc4dmq0mik1kab4czf56s8wm2jvm7xjqvi6y5mp"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index 79f364be2000..af3a8b4d22fd 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.5.0"; - sha256 = "0v8lspfca820mf45dj9hb56q00syhrqw5wmqmy1vnrcb6wx4csv6"; + version = "9.6.1"; + sha256 = "04hi7lwdizwqqbyi77f4z12gnsh673h92brmbssrmw5kjx6h4k5q"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 751638e02da8..dde8ada0db93 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ../../node-packages/node-env.nix { @@ -13,4 +13,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} |