summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaka Hudoklin <offlinehacker@users.noreply.github.com>2017-09-22 13:21:50 +0200
committerGitHub <noreply@github.com>2017-09-22 13:21:50 +0200
commite17e22d455dfeadac47b38f467ba9d8700a3fcfd (patch)
treeba91f431fdd8b0b6fd07acb4981ce35fcd519be8
parentb2924389accc533489d74ea9d870b2ca48f74df6 (diff)
parent9d2a2dc43e70d8da21c82596cf80d55d53086fc3 (diff)
downloadnixlib-e17e22d455dfeadac47b38f467ba9d8700a3fcfd.tar
nixlib-e17e22d455dfeadac47b38f467ba9d8700a3fcfd.tar.gz
nixlib-e17e22d455dfeadac47b38f467ba9d8700a3fcfd.tar.bz2
nixlib-e17e22d455dfeadac47b38f467ba9d8700a3fcfd.tar.lz
nixlib-e17e22d455dfeadac47b38f467ba9d8700a3fcfd.tar.xz
nixlib-e17e22d455dfeadac47b38f467ba9d8700a3fcfd.tar.zst
nixlib-e17e22d455dfeadac47b38f467ba9d8700a3fcfd.zip
Merge pull request #29529 from holidaycheck/nodejs-8.5.0
libuv: 1.14.1 and nodejs 8.5.0
-rw-r--r--pkgs/development/libraries/libuv/default.nix4
-rw-r--r--pkgs/development/web/nodejs/v8.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 1bc58260afe4..50d588dad79b 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,14 +2,14 @@
 , ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.13.1";
+  version = "1.14.1";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "0k348kgdphha1w4cw78zngq3gqcrhcn0az7k0k4w2bgmdf4ip8z8";
+    sha256 = "1121qvnvpcabq1bl2k41jq8r2hn2x123csiaf7s9vrq66bbxgfdx";
   };
 
   postPatch = let
diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index af329063e9fc..244c236cd18b 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.4.0";
+    version = "8.5.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       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 ];