diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 626560d89b6..3de7afd9668 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -7,7 +7,6 @@ , cloudpickle , msgpack , isPy27 -, selectors34 , pytestCheckHook }: @@ -15,6 +14,8 @@ buildPythonPackage rec { pname = "Pyro4"; version = "4.80"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220"; @@ -22,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ serpent - ] ++ lib.optionals isPy27 [ selectors34 ]; + ]; buildInputs = [ dill diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix deleted file mode 100644 index 2209ccf43d2..00000000000 --- a/pkgs/development/python-modules/selectors34/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python -, six -}: - -buildPythonPackage rec { - pname = "selectors34"; - version = "1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c"; - }; - - propagatedBuildInputs = [ six ]; - - checkPhase = '' - ${python.interpreter} setup.py test - ''; - - meta = with lib; { - description = "A backport of the selectors module from Python 3.4"; - homepage = "https://github.com/berkerpeksag/selectors34"; - license = licenses.psfl; - maintainers = with maintainers; [ prusnak ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4a19d69d562..277731a5d4b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -48,6 +48,7 @@ mapAliases ({ pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c51f9ccbab..e26d70b15bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7666,8 +7666,6 @@ in { selectors2 = callPackage ../development/python-modules/selectors2 { }; - selectors34 = callPackage ../development/python-modules/selectors34 { }; - selenium = callPackage ../development/python-modules/selenium { }; semantic-version = callPackage ../development/python-modules/semantic-version { };