diff --git a/pkgs/development/python-modules/pyuv-external-libuv.patch b/pkgs/development/python-modules/pyuv-external-libuv.patch index 33539d9b4b2c..41e169acd5f5 100644 --- a/pkgs/development/python-modules/pyuv-external-libuv.patch +++ b/pkgs/development/python-modules/pyuv-external-libuv.patch @@ -1,27 +1,25 @@ diff --git a/setup.py b/setup.py -index ec0caac..2c1fdb6 100644 +index 5071c3b..4b4a176 100644 --- a/setup.py +++ b/setup.py -@@ -6,7 +6,6 @@ try: +@@ -7,7 +7,6 @@ try: from setuptools import setup, Extension except ImportError: from distutils.core import setup, Extension -from setup_libuv import libuv_build_ext, libuv_sdist - - - __version__ = "0.11.5" -@@ -32,12 +31,11 @@ setup(name = "pyuv", + + + def get_version(): +@@ -35,11 +34,10 @@ setup(name = "pyuv", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4" ], - cmdclass = {'build_ext': libuv_build_ext, - 'sdist' : libuv_sdist}, - ext_modules = [Extension('pyuv', + packages = ['pyuv'], + ext_modules = [Extension('pyuv._cpyuv', sources = ['src/pyuv.c'], -+ libraries = ['uv'], - define_macros=[('MODULE_VERSION', __version__), -- ('LIBUV_REVISION', libuv_build_ext.libuv_revision)] -+ ('LIBUV_REVISION', 'unknown')] ++ libraries = ['uv'] )] ) - + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c04c6feb785..e755ff208b1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22278,12 +22278,12 @@ 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 ];