JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7720 from Ralith/libuv

Browse Source 
libuv: version 1.4.2
This commit is contained in:
Domen Kožar 2015-05-06 11:29:52 +02:00
commit bc453c868e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libuv/default.nix
View File

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

4
pkgs/top-level/all-packages.nix
View File

@ -1884,7 +1884,7 @@ let
else else
nodePackages_0_12; 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; }; iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
@ -6938,6 +6938,8 @@ let
automake = automake113x; # fails with 14 automake = automake113x; # fails with 14
}); });
libuv = libuvVersions.v1_4_2;
libv4l = lowPrio (v4l_utils.override { libv4l = lowPrio (v4l_utils.override {
alsaLib = null; alsaLib = null;
libX11 = null; libX11 = null;