alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fetchPypi: move to top level

Browse source 
fetchPypi doesn't use python under the hood and doesn't need to be tied
to a specific version of python. Moving it to top level makes it more
consistent with other fetchers and makes code generation easier.
This commit is contained in:
figsoda 2023-01-17 11:46:03 -05:00 committed by Frederik Rietdijk
parent a72e215c75
commit 3290828905
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
pkgs/development/interpreters/python/fetchpypi.nix → pkgs/build-support/fetchpypi/default.nix
View file

4
pkgs/development/interpreters/python/python-packages-base.nix
View file

@ -41,8 +41,6 @@ let
# See build-setupcfg/default.nix for documentation.
buildSetupcfg = import ../../../build-support/build-setupcfg self;
fetchPypi = callPackage ./fetchpypi.nix { };
# Check whether a derivation provides a Python module.
hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python;
@ -89,7 +87,7 @@ in {
inherit lib pkgs stdenv;
inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder;
inherit buildPythonPackage buildPythonApplication;
inherit fetchPypi;
inherit (pkgs) fetchPypi;
inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf;
inherit toPythonModule toPythonApplication;
inherit buildSetupcfg;

2
pkgs/top-level/all-packages.nix
View file

@ -935,6 +935,8 @@ with pkgs;
fetchgx = callPackage ../build-support/fetchgx { };
fetchPypi = callPackage ../build-support/fetchpypi { };
resolveMirrorURLs = {url}: fetchurl {
showURLs = true;
inherit url;