mirror of
https://github.com/vale981/poetry2nix
synced 2025-03-04 16:51:40 -05:00
Fixes pypi fetching
- The first letter path segment in the url needs to be lowercased https://files.pythonhosted.org/packages/source/S/sqlalchemy/SQLAlchemy-1.3.11.tar.gz vs https://files.pythonhosted.org/packages/source/s/sqlalchemy/SQLAlchemy-1.3.11.tar.gz - Rename fetchPypi to fetchFromPypi just to make it clear that we are not using fetchPypi from nixpkgs
This commit is contained in:
parent
3ffc6ecc6b
commit
67602e51e1
1 changed files with 8 additions and 4 deletions
12
default.nix
12
default.nix
|
@ -14,15 +14,19 @@ let
|
||||||
else default
|
else default
|
||||||
);
|
);
|
||||||
|
|
||||||
# Fetch the artifacts from the PyPI index.
|
# Fetch the artifacts from the PyPI index. Since we get all
|
||||||
|
# info we need from the lock file we don't use nixpkgs' fetchPyPi
|
||||||
|
# as it modifies casing while not providing anything we don't already
|
||||||
|
# have.
|
||||||
#
|
#
|
||||||
# Args:
|
# Args:
|
||||||
|
# pname: package name
|
||||||
# file: filename including extension
|
# file: filename including extension
|
||||||
# hash: SRI hash
|
# hash: SRI hash
|
||||||
# kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention
|
# kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention
|
||||||
fetchPypi = lib.makeOverridable ({ pname, file, hash, kind }:
|
fetchFromPypi = lib.makeOverridable ({ pname, file, hash, kind }:
|
||||||
pkgs.fetchurl {
|
pkgs.fetchurl {
|
||||||
url = "https://files.pythonhosted.org/packages/${kind}/${builtins.substring 0 1 file}/${pname}/${file}";
|
url = "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}";
|
||||||
inherit hash;
|
inherit hash;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -138,7 +142,7 @@ let
|
||||||
broken = ! isCompatible python.version pkgMeta.python-versions;
|
broken = ! isCompatible python.version pkgMeta.python-versions;
|
||||||
};
|
};
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchFromPypi {
|
||||||
pname = pkgMeta.name;
|
pname = pkgMeta.name;
|
||||||
inherit (file) file hash;
|
inherit (file) file hash;
|
||||||
# We need to retrieve kind from the interpreter and the filename of the package
|
# We need to retrieve kind from the interpreter and the filename of the package
|
||||||
|
|
Loading…
Add table
Reference in a new issue