diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index d7cd453c93d5..8488278c934b 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -1,5 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy33, pythonOlder, - asyncio +{ lib, buildPythonPackage, fetchPypi, pythonOlder, }: buildPythonPackage rec { @@ -17,7 +16,5 @@ buildPythonPackage rec { sha256 = "17vrl6jajr81bql7kjgq0zkxy225px97z4g9wmbhbbnvzn1p92c0"; }; - buildInputs = lib.optionals isPy33 [ asyncio ]; - disabled = pythonOlder "3.3"; } diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index f7ac236a520d..0edbb2129f33 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, isPy33, isPy27, isPyPy, python, pycares, typing, asyncio, trollius }: +, isPy27, isPyPy, python, pycares, typing, trollius }: buildPythonPackage rec { pname = "aiodns"; diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix index f137484a8247..ccac3e6f0773 100644 --- a/pkgs/development/python-modules/aioeventlet/default.nix +++ b/pkgs/development/python-modules/aioeventlet/default.nix @@ -3,21 +3,21 @@ , fetchPypi , eventlet , trollius -, asyncio , mock , python }: buildPythonPackage rec { pname = "aioeventlet"; - version = "0.5.1"; + # version is called 0.5.1 on PyPI, but the filename is aioeventlet-0.5.2.tar.gz + version = "0.5.2"; src = fetchPypi { inherit pname version; sha256 = "cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a"; }; - propagatedBuildInputs = [ eventlet trollius asyncio ]; + propagatedBuildInputs = [ eventlet trollius ]; buildInputs = [ mock ]; # 2 tests error out diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 55d68f93f2c7..4728d819f05a 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -1,10 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy33 , pythonOlder -, asyncio -, singledispatch }: buildPythonPackage rec { @@ -18,8 +15,6 @@ buildPythonPackage rec { disabled = pythonOlder "3.3"; - propagatedBuildInputs = lib.optionals isPy33 [ asyncio singledispatch ]; - # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix deleted file mode 100644 index 5a6dbe798148..000000000000 --- a/pkgs/development/python-modules/asyncio/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy34 }: - -buildPythonPackage rec { - pname = "asyncio"; - version = "3.4.3"; - disabled = !isPy34; - - src = fetchPypi { - inherit pname version; - sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3"; - }; - - meta = with stdenv.lib; { - description = "Reference implementation of PEP 3156"; - homepage = http://www.python.org/dev/peps/pep-3156; - license = licenses.free; - }; -} diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index d2d1e48b4c62..0ccf3da7bec9 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy33, - six, txaio, twisted, zope_interface, cffi, asyncio, trollius, futures, +{ lib, buildPythonPackage, fetchPypi, isPy3k, + six, txaio, twisted, zope_interface, cffi, trollius, futures, mock, pytest }: buildPythonPackage rec { @@ -12,7 +12,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ - (lib.optional isPy33 asyncio) ++ (lib.optionals (!isPy3k) [ trollius futures ]); checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index e548781fde62..41188a0de6e5 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , withVoice ? true, libopus -, asyncio , aiohttp , websockets , pynacl @@ -18,7 +17,7 @@ buildPythonPackage rec { sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108"; }; - propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; + propagatedBuildInputs = [ aiohttp websockets pynacl ]; patchPhase = '' substituteInPlace "requirements.txt" \ --replace "aiohttp>=1.0.0,<1.1.0" "aiohttp" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5544dca851d4..770ca8b3d0cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -997,8 +997,6 @@ in { astor = callPackage ../development/python-modules/astor {}; - asyncio = callPackage ../development/python-modules/asyncio {}; - asyncssh = callPackage ../development/python-modules/asyncssh { }; python-fontconfig = callPackage ../development/python-modules/python-fontconfig { };