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

nodejs-6_x: 6.7.0 -> 6.8.0

Browse Source
This commit is contained in:
Graham Christensen 2016-10-13 07:27:18 -04:00
parent f9df1b5de0
commit 66f2a01222
No known key found for this signature in database
GPG Key ID: FE918C3A98C1030F
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,8 @@
, preBuild ? "" , preBuild ? ""
, extraConfigFlags ? [] , extraConfigFlags ? []
, extraBuildInputs ? [] , extraBuildInputs ? []
, ... , patches ? [],
...
}: }:
assert stdenv.system != "armv5tel-linux"; assert stdenv.system != "armv5tel-linux";
@ -44,7 +45,7 @@ in stdenv.mkDerivation {
PATH=$out/bin:$PATH patchShebangs $out 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 buildInputs = extraBuildInputs
++ [ python which zlib libuv openssl ] ++ [ python which zlib libuv openssl ]

12
pkgs/development/web/nodejs/v6.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool , pkgconfig, runCommand, which, libtool, fetchpatch
, callPackage , callPackage
, darwin ? null , darwin ? null
}@args: }@args:
@ -8,12 +8,18 @@ let
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
in import ./nodejs.nix (args // rec { in import ./nodejs.nix (args // rec {
version = "6.7.0"; version = "6.8.0";
sha256 = "1r9vvnczjczqs29ja8gmbqgsfgkg0dph4qkaxb3yh7mb98r2ic6f"; sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq";
extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin
[ CoreServices ApplicationServices ]; [ CoreServices ApplicationServices ];
preBuild = stdenv.lib.optionalString stdenv.isDarwin '' preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i -e "s|tr1/type_traits|type_traits|g" \ sed -i -e "s|tr1/type_traits|type_traits|g" \
-e "s|std::tr1|std|" src/util.h -e "s|std::tr1|std|" src/util.h
''; '';
patches = [
(fetchpatch {
url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch";
sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i";
})
];
}) })