Merge pull request #7780 from Ralith/libuv

libuv: version 1.5.0
This commit is contained in:
lethalman 2015-05-14 17:01:12 +02:00
commit 78c6fd6e68
2 changed files with 3 additions and 3 deletions

View file

@ -105,5 +105,5 @@ in
//
mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
v1_4_2 = "03ffyjyz92ipi2im05hvlx7jypv9c8fyp90zqyr91w7vszskxnxw";
v1_5_0 = "1j0871mxw97680ghlqy0dpyfmr26kqa0lk26a2bgcqf4ghqap24x";
}

View file

@ -1891,7 +1891,7 @@ let
else
nodePackages_0_12;
iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_2; };
iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_5_0; };
iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
@ -7027,7 +7027,7 @@ let
automake = automake113x; # fails with 14
});
libuv = libuvVersions.v1_4_2;
libuv = libuvVersions.v1_5_0;
libv4l = lowPrio (v4l_utils.override {
alsaLib = null;