public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.fetchPypi: put expression in own file

Browse Source 
Also fixes an evaluation bug.
This commit is contained in:
Frederik Rietdijk 2019-07-11 16:06:32 +02:00 committed by Frederik Rietdijk
parent 3a25279b2e
commit f2a8117492
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/interpreters/python/fetchpypi.nix Normal file
View File

@ -0,0 +1,22 @@
# `fetchPypi` function for fetching artifacts from PyPI.
{ fetchurl
, makeOverridable
}:
makeOverridable( {format ? "setuptools", ... } @attrs:
let
fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}:
# Fetch a wheel. By default we fetch an universal wheel.
# See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments.
let
url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
in fetchurl {inherit url sha256;};
fetchSource = {pname, version, sha256, extension ? "tar.gz"}:
# Fetch a source tarball.
let
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}";
in fetchurl {inherit url sha256;};
fetcher = (if format == "wheel" then fetchWheel
else if format == "setuptools" then fetchSource
else throw "Unsupported format ${format}");
in fetcher (builtins.removeAttrs attrs ["format"]) )

18
pkgs/top-level/python-packages.nix
View File

@ -58,23 +58,7 @@ let
# See build-setupcfg/default.nix for documentation. # See build-setupcfg/default.nix for documentation.
buildSetupcfg = import ../build-support/build-setupcfg self; buildSetupcfg = import ../build-support/build-setupcfg self;
fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs: fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix {};
let
fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}:
# Fetch a wheel. By default we fetch an universal wheel.
# See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments.
let
url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
in pkgs.fetchurl {inherit url sha256;};
fetchSource = {pname, version, sha256, extension ? "tar.gz"}:
# Fetch a source tarball.
let
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}";
in pkgs.fetchurl {inherit url sha256;};
fetcher = (if format == "wheel" then fetchWheel
else if format == "setuptools" then fetchSource
else throw "Unsupported kind ${kind}");
in fetcher (builtins.removeAttrs attrs ["format"]) );
# Check whether a derivation provides a Python module. # Check whether a derivation provides a Python module.
hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python;