diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 48d12321248c..e039711e457b 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,9 +2,23 @@ , ApplicationServices, CoreServices }: -let - stable = "stable"; - unstable = "unstable"; +stdenv.mkDerivation rec { + version = "1.9.0"; + name = "libuv-${version}"; + + src = fetchFromGitHub { + owner = "libuv"; + repo = "libuv"; + rev = "v${version}"; + sha256 = "0sq8c8n7xixn2xxp35crprvh35ry18i5mcxgwh12lydwv9ks0d4k"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; + + preConfigure = '' + LIBTOOLIZE=libtoolize ./autogen.sh + ''; meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; @@ -13,73 +27,4 @@ let platforms = with platforms; linux ++ darwin; }; - mkName = stability: version: - if stability == stable - then "libuv-${version}" - else "libuv-${stability}-${version}"; - - mkSrc = version: sha256: fetchFromGitHub { - owner = "libuv"; - repo = "libuv"; - rev = "v${version}"; - inherit sha256; - }; - - # for versions < 0.11.6 - mkWithoutAutotools = stability: version: sha256: stdenv.mkDerivation { - name = mkName stability version; - src = mkSrc version sha256; - buildPhase = lib.optionalString stdenv.isDarwin '' - mkdir extrapath - ln -s /usr/sbin/dtrace extrapath/dtrace - export PATH=$PATH:`pwd`/extrapath - '' + '' - mkdir build - make builddir_name=build - - rm -r build/src - rm build/libuv.a - cp -r include build - - mkdir build/lib - mv build/libuv.* build/lib - - pushd build/lib - lib=$(basename libuv.*) - ext="''${lib##*.}" - mv $lib libuv.10.$ext - ln -s libuv.10.$ext libuv.$ext - popd - ''; - installPhase = '' - cp -r build $out - ''; - inherit meta; - }; - - # for versions > 0.11.6 - mkWithAutotools = stability: version: sha256: stdenv.mkDerivation { - name = mkName stability version; - src = mkSrc version sha256; - buildInputs = [ automake autoconf libtool pkgconfig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; - preConfigure = '' - LIBTOOLIZE=libtoolize ./autogen.sh - ''; - inherit meta; - }; - - toVersion = with lib; name: - replaceChars ["_"] ["."] (removePrefix "v" name); - -in - - with lib; - - mapAttrs (v: h: mkWithAutotools unstable (toVersion v) h) { - v0_11_29 = "1z07phfwryfy2155p3lxcm2a33h20sfl96lds5dghn157x6csz7m"; - } - // - mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) { - v1_7_5 = "18x6cy2xn31am97vn6jli7kmb2fbp4c8kmv7jm97vggh0x55flsc"; - } +} 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";