diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-10-13 07:27:18 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2016-10-13 20:04:24 -0400 |
| commit | 66f2a012228f9339dbe3ab0cba0ba479625af029 (patch) | |
| tree | a7339aa5de19021c81f29d9ea2c7dad43d60000c /pkgs/development/web | |
| parent | f9df1b5de06792f8bd1a2b78d51705b066b8d0ce (diff) | |
| download | nixlib-66f2a012228f9339dbe3ab0cba0ba479625af029.tar nixlib-66f2a012228f9339dbe3ab0cba0ba479625af029.tar.gz nixlib-66f2a012228f9339dbe3ab0cba0ba479625af029.tar.bz2 nixlib-66f2a012228f9339dbe3ab0cba0ba479625af029.tar.lz nixlib-66f2a012228f9339dbe3ab0cba0ba479625af029.tar.xz nixlib-66f2a012228f9339dbe3ab0cba0ba479625af029.tar.zst nixlib-66f2a012228f9339dbe3ab0cba0ba479625af029.zip | |
nodejs-6_x: 6.7.0 -> 6.8.0
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v6.nix | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index c10fe99f74a9..6cf73fd22b64 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -6,7 +6,8 @@ , preBuild ? "" , extraConfigFlags ? [] , extraBuildInputs ? [] -, ... +, patches ? [], + ... }: assert stdenv.system != "armv5tel-linux"; @@ -44,7 +45,7 @@ in stdenv.mkDerivation { PATH=$out/bin:$PATH patchShebangs $out ''; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; + patches = patches ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; buildInputs = extraBuildInputs ++ [ python which zlib libuv openssl ] diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index f5d6e52ee441..ac54f0f8d492 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool +, pkgconfig, runCommand, which, libtool, fetchpatch , callPackage , darwin ? null }@args: @@ -8,12 +8,18 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; in import ./nodejs.nix (args // rec { - version = "6.7.0"; - sha256 = "1r9vvnczjczqs29ja8gmbqgsfgkg0dph4qkaxb3yh7mb98r2ic6f"; + version = "6.8.0"; + sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq"; extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin '' sed -i -e "s|tr1/type_traits|type_traits|g" \ -e "s|std::tr1|std|" src/util.h ''; + patches = [ + (fetchpatch { + url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; + sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; + }) + ]; }) |