Merge pull request #29529 from holidaycheck/nodejs-8.5.0

libuv: 1.14.1 and nodejs 8.5.0
This commit is contained in:
Jaka Hudoklin 2017-09-22 13:21:50 +02:00 committed by GitHub
commit e17e22d455
2 changed files with 4 additions and 4 deletions

View File

@ -2,14 +2,14 @@
, ApplicationServices, CoreServices }: , ApplicationServices, CoreServices }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.13.1"; version = "1.14.1";
name = "libuv-${version}"; name = "libuv-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libuv"; owner = "libuv";
repo = "libuv"; repo = "libuv";
rev = "v${version}"; rev = "v${version}";
sha256 = "0k348kgdphha1w4cw78zngq3gqcrhcn0az7k0k4w2bgmdf4ip8z8"; sha256 = "1121qvnvpcabq1bl2k41jq8r2hn2x123csiaf7s9vrq66bbxgfdx";
}; };
postPatch = let postPatch = let

View File

@ -10,11 +10,11 @@ let
baseName = if enableNpm then "nodejs" else "nodejs-slim"; baseName = if enableNpm then "nodejs" else "nodejs-slim";
in in
stdenv.mkDerivation (nodejs // rec { stdenv.mkDerivation (nodejs // rec {
version = "8.4.0"; version = "8.5.0";
name = "${baseName}-${version}"; name = "${baseName}-${version}";
src = fetchurl { src = fetchurl {
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
sha256 = "0qgkccsldpdrjxwwq78z94hsqz6qivmi4n2738iiginw06hs4njx"; sha256 = "0g2wyy9zdjzm9c0vbjn8bn49s1b2c7r2iwdfc4dpx7h4wpcfbkg1";
}; };
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];