From bb9a82da440317724b812f04c0355dd35fa819f9 Mon Sep 17 00:00:00 2001 From: Xing Yang Date: Sun, 24 Jul 2022 21:03:23 +0100 Subject: [PATCH 1/3] Fix build failure when editable dependencies exist in pyproject.toml --- hooks/pyproject-without-special-deps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hooks/pyproject-without-special-deps.py b/hooks/pyproject-without-special-deps.py index b74bfeb..76f5260 100644 --- a/hooks/pyproject-without-special-deps.py +++ b/hooks/pyproject-without-special-deps.py @@ -22,6 +22,7 @@ def main(input, output, fields_to_remove): any_removed |= dep.pop(field, None) is not None if any_removed: dep["version"] = "*" + dep.pop("develop", None) output.write(tomlkit.dumps(data)) From e204959568095af7f38e393bb8a498c53dbbe008 Mon Sep 17 00:00:00 2001 From: Xing Yang Date: Mon, 22 Aug 2022 19:56:00 +0100 Subject: [PATCH 2/3] Adopt nixpkgs pillow preConfigure script --- overrides/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/overrides/default.nix b/overrides/default.nix index e0284cb..fca41d4 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -1351,13 +1351,18 @@ lib.composeManyExtensions [ ); pillow = super.pillow.overridePythonAttrs ( - old: { + old: + let + preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure; + in + { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config self.pytest-runner ]; buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ] ++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ]; + preConfigure = lib.optional (old.format != "wheel") preConfigure; } ); From d7aaf7333fae0052519a66fe65de94f0327c47f6 Mon Sep 17 00:00:00 2001 From: Xing Yang Date: Tue, 23 Aug 2022 20:13:25 +0100 Subject: [PATCH 3/3]