diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2016-04-28 08:56:31 +0000 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2016-04-28 08:56:31 +0000 |
| commit | d76982e18159f02d80cca5ef4fcb14b0dc70f42b (patch) | |
| tree | 625978c48d71c3d7e75ca151222ec1f40b472051 /pkgs/top-level | |
| parent | d27caa486b03781768cacd7f17881f31adfe4ff8 (diff) | |
| parent | c893105f1f4497225a70961513726f5243a242f7 (diff) | |
| download | nixlib-d76982e18159f02d80cca5ef4fcb14b0dc70f42b.tar nixlib-d76982e18159f02d80cca5ef4fcb14b0dc70f42b.tar.gz nixlib-d76982e18159f02d80cca5ef4fcb14b0dc70f42b.tar.bz2 nixlib-d76982e18159f02d80cca5ef4fcb14b0dc70f42b.tar.lz nixlib-d76982e18159f02d80cca5ef4fcb14b0dc70f42b.tar.xz nixlib-d76982e18159f02d80cca5ef4fcb14b0dc70f42b.tar.zst nixlib-d76982e18159f02d80cca5ef4fcb14b0dc70f42b.zip | |
Merge pull request #14973 from holidaycheck/update-libuv
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 | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f23ef2672a23..10f3938f5181 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8049,12 +8049,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 6bb1013bd72e..fc640bc15ecb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22366,17 +22366,17 @@ in modules // { }; pyuv = buildPythonPackage rec { - name = "pyuv-0.11.5"; + name = "pyuv-1.2.0"; disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49 src = pkgs.fetchurl { url = "https://github.com/saghul/pyuv/archive/${name}.tar.gz"; - sha256 = "c251952cb4e54c92ab0e871decd13cf73d11ca5dba9f92962de51d12e3a310a9"; + sha256 = "19yl1l5l6dq1xr8xcv6dhx1avm350nr4v2358iggcx4ma631rycx"; }; 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"; |