diff options
| author | Tobias Pflug <tobias.pflug@holidaycheck.com> | 2016-04-25 16:04:22 +0200 |
|---|---|---|
| committer | Tobias Pflug <tobias.pflug@holidaycheck.com> | 2016-04-27 11:06:47 +0200 |
| commit | 7dcf75bdd4eb85bce2506eb95d338a5da5e9a5e9 (patch) | |
| tree | b2a622cccd5b58f9ffddda1de0d2cf23f436e163 /pkgs/top-level | |
| parent | 25c35529f428a8d6d1149e6b2b879854e342f500 (diff) | |
| download | nixlib-7dcf75bdd4eb85bce2506eb95d338a5da5e9a5e9.tar nixlib-7dcf75bdd4eb85bce2506eb95d338a5da5e9a5e9.tar.gz nixlib-7dcf75bdd4eb85bce2506eb95d338a5da5e9a5e9.tar.bz2 nixlib-7dcf75bdd4eb85bce2506eb95d338a5da5e9a5e9.tar.lz nixlib-7dcf75bdd4eb85bce2506eb95d338a5da5e9a5e9.tar.xz nixlib-7dcf75bdd4eb85bce2506eb95d338a5da5e9a5e9.tar.zst nixlib-7dcf75bdd4eb85bce2506eb95d338a5da5e9a5e9.zip | |
libuv: 1.7.5 -> 1.9.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0851c5fb941c..cee180b89d8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8037,12 +8037,9 @@ in then darwin.libunwind else callPackage ../development/libraries/libunwind { }; - libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { - automake = automake113x; # fails with 14 + libuv = callPackage ../development/libraries/libuv { inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }); - - libuv = self.libuvVersions.v1_7_5; + }; libv4l = lowPrio (self.v4l_utils.override { alsaLib = null; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 304c4932d8e8..8c04c6feb785 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22288,7 +22288,7 @@ in modules // { patches = [ ../development/python-modules/pyuv-external-libuv.patch ]; - buildInputs = with self; [ pkgs.libuvVersions.v0_11_29 ]; + buildInputs = with self; [ pkgs.libuv ]; meta = { description = "Python interface for libuv"; |