hiro/poetry2nix
1
0
Fork 0
mirror of https://github.com/vale981/poetry2nix synced 2025-03-05 09:11:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #689 from crossing/master

Browse source 
Fix build failure when pyproject.toml contains editable path dependencies
This commit is contained in:
adisbladis 2022-08-24 11:55:51 +12:00 • committed by GitHub
commit e1e95bbf61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hooks/pyproject-without-special-deps.py
View file

@ -22,6 +22,7 @@ def main(input, output, fields_to_remove):
any_removed |= dep.pop(field, None) is not None any_removed |= dep.pop(field, None) is not None
if any_removed: if any_removed:
dep["version"] = "*" dep["version"] = "*"
dep.pop("develop", None)
output.write(tomlkit.dumps(data)) output.write(tomlkit.dumps(data))

7
overrides/default.nix
View file

@ -1352,13 +1352,18 @@ lib.composeManyExtensions [
); );
pillow = super.pillow.overridePythonAttrs ( pillow = super.pillow.overridePythonAttrs (
old: { old:
let
preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure;
in
{
nativeBuildInputs = (old.nativeBuildInputs or [ ]) nativeBuildInputs = (old.nativeBuildInputs or [ ])
++ [ pkg-config self.pytest-runner ]; ++ [ pkg-config self.pytest-runner ];
buildInputs = with pkgs; (old.buildInputs or [ ]) buildInputs = with pkgs; (old.buildInputs or [ ])
++ [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ]
++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ] ++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ]
++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ]; ++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ];
preConfigure = lib.optional (old.format != "wheel") preConfigure;
} }
); );