diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-13 09:46:03 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-13 09:46:03 +0200 |
commit | 4aee94629dce852c6021f5ae8ce60de0508d7e37 (patch) | |
tree | 22b3f1398f6b0d6203baeddc86181eac89190d1f /pkgs/development/interpreters | |
parent | ec7f569211091282410050e89e68832d4fe60528 (diff) | |
parent | 54065ae20d6c91cab54aa706d6e819baf673b80c (diff) | |
download | nixlib-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar nixlib-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.gz nixlib-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.bz2 nixlib-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.lz nixlib-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.xz nixlib-4aee94629dce852c6021f5ae8ce60de0508d7e37.tar.zst nixlib-4aee94629dce852c6021f5ae8ce60de0508d7e37.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/python/build-python-package-wheel.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/fetchpypi.nix | 28 |
2 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/build-python-package-wheel.nix b/pkgs/development/interpreters/python/build-python-package-wheel.nix index 7be0a4c304a3..e3c4e13c0e2d 100644 --- a/pkgs/development/interpreters/python/build-python-package-wheel.nix +++ b/pkgs/development/interpreters/python/build-python-package-wheel.nix @@ -8,7 +8,7 @@ attrs // { unpackPhase = '' mkdir dist - cp $src dist/"''${src#*-}" + cp "$src" "dist/$(stripHash "$src")" ''; # Wheels are pre-compiled diff --git a/pkgs/development/interpreters/python/fetchpypi.nix b/pkgs/development/interpreters/python/fetchpypi.nix new file mode 100644 index 000000000000..e60c9df1f8bb --- /dev/null +++ b/pkgs/development/interpreters/python/fetchpypi.nix @@ -0,0 +1,28 @@ +# `fetchPypi` function for fetching artifacts from PyPI. +{ fetchurl +, makeOverridable +}: + +let + computeUrl = {format ? "setuptools", ... } @attrs: let + computeWheelUrl = {pname, version, 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. + "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; + + computeSourceUrl = {pname, version, extension ? "tar.gz"}: + # Fetch a source tarball. + "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}"; + + compute = (if format == "wheel" then computeWheelUrl + else if format == "setuptools" then computeSourceUrl + else throw "Unsupported format ${format}"); + + in compute (builtins.removeAttrs attrs ["format"]); + +in makeOverridable( {format ? "setuptools", sha256 ? "", hash ? "", ... } @attrs: + let + url = computeUrl (builtins.removeAttrs attrs ["sha256" "hash"]) ; + in fetchurl { + inherit url sha256 hash; + }) |