From 7f00ab7f674f29ec220176a094c99161cab6a3a5 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Wed, 6 May 2015 01:44:24 +0000 Subject: [PATCH] libuv: version 1.4.2 --- pkgs/development/libraries/libuv/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 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;