summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorBenjamin Saunders <ben.e.saunders@gmail.com>2015-05-06 01:44:24 +0000
committerBenjamin Saunders <ben.e.saunders@gmail.com>2015-05-06 01:44:24 +0000
commit7f00ab7f674f29ec220176a094c99161cab6a3a5 (patch)
tree532043645bec7b6b06478b70ed39a1b7e74b4cce /pkgs
parent007dfb8438cc360acfe4a43dec68f7f08c04196a (diff)
downloadnixlib-7f00ab7f674f29ec220176a094c99161cab6a3a5.tar
nixlib-7f00ab7f674f29ec220176a094c99161cab6a3a5.tar.gz
nixlib-7f00ab7f674f29ec220176a094c99161cab6a3a5.tar.bz2
nixlib-7f00ab7f674f29ec220176a094c99161cab6a3a5.tar.lz
nixlib-7f00ab7f674f29ec220176a094c99161cab6a3a5.tar.xz
nixlib-7f00ab7f674f29ec220176a094c99161cab6a3a5.tar.zst
nixlib-7f00ab7f674f29ec220176a094c99161cab6a3a5.zip
libuv: version 1.4.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libuv/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 3ce377dfb08a..f85c2bef1853 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -105,5 +105,5 @@ in
   //
   mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
     v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
-    v1_4_0 = "17k028gn07vb9in440wbf0ar0rdl8bi5v4shm8nhj22vfb18dhl5";
+    v1_4_2 = "03ffyjyz92ipi2im05hvlx7jypv9c8fyp90zqyr91w7vszskxnxw";
   }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 648d78749f24..4372d2283cdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1884,7 +1884,7 @@ let
   else
     nodePackages_0_12;
 
-  iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; };
+  iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_2; };
 
   iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
 
@@ -6936,6 +6936,8 @@ let
     automake = automake113x; # fails with 14
   });
 
+  libuv = libuvVersions.v1_4_2;
+
   libv4l = lowPrio (v4l_utils.override {
     alsaLib = null;
     libX11 = null;