diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-01 19:56:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-01 19:56:32 +0200 |
| commit | 076e3d55c0a68602d6769ebe8d3c349e88e1eeaa (patch) | |
| tree | 4c404407976d816c18788e0bf830a7f7fbb3eff3 /pkgs | |
| parent | 1caea57e504147aa6e74118a710e08ca505e5968 (diff) | |
| parent | ffbf6f27c97cd4ecb794c39fd183363be72c5a1f (diff) | |
| download | nixpkgs-076e3d55c0a68602d6769ebe8d3c349e88e1eeaa.tar nixpkgs-076e3d55c0a68602d6769ebe8d3c349e88e1eeaa.tar.gz nixpkgs-076e3d55c0a68602d6769ebe8d3c349e88e1eeaa.tar.bz2 nixpkgs-076e3d55c0a68602d6769ebe8d3c349e88e1eeaa.tar.lz nixpkgs-076e3d55c0a68602d6769ebe8d3c349e88e1eeaa.tar.xz nixpkgs-076e3d55c0a68602d6769ebe8d3c349e88e1eeaa.tar.zst nixpkgs-076e3d55c0a68602d6769ebe8d3c349e88e1eeaa.zip | |
Merge pull request #234043 from figsoda/pypi
python3.pkgs.fetchPypi: deprecate in favor of top-level fetchPypi
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/python/python-packages-base.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 0899ad18e96..6a723413c85 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -8,7 +8,6 @@ self: let inherit (self) callPackage; - inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; namePrefix = python.libPrefix + "-"; @@ -92,7 +91,6 @@ in { inherit lib pkgs stdenv; inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit buildPythonPackage buildPythonApplication; - inherit (pkgs) fetchPypi; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; inherit buildSetupcfg; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c9d0febd30c..3fb7e5a82bf 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -104,6 +104,7 @@ mapAliases ({ face_recognition_models = face-recognition-models; # added 2022-10-15 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 + inherit (super.pkgs) fetchPypi; # added 2023-05-25 filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19 flaskbabel = flask-babel; # added 2023-01-19 flask_login = flask-login; # added 2022-10-17 |