From 6d174d69924fc253ccd914dc9c0d5ea948dfbc1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Aug 2025 10:12:26 +0200 Subject: [PATCH 1/2] python313Packages.fpdf2: modernize --- .../python-modules/fpdf2/default.nix | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix index 41e518d00490..f2c6bd602056 100644 --- a/pkgs/development/python-modules/fpdf2/default.nix +++ b/pkgs/development/python-modules/fpdf2/default.nix @@ -1,20 +1,17 @@ { lib, buildPythonPackage, - fetchFromGitHub, - - setuptools, - - defusedxml, - pillow, - fonttools, - - pytestCheckHook, - pytest-cov-stub, - qrcode, camelot, - uharfbuzz, + defusedxml, + fetchFromGitHub, + fonttools, lxml, + pillow, + pytest-cov-stub, + pytestCheckHook, + qrcode, + setuptools, + uharfbuzz, }: buildPythonPackage rec { @@ -29,21 +26,21 @@ buildPythonPackage rec { hash = "sha256-uLaVRseakLg7Q9QO4F6BM7vQIFeA44ry8cqDfas8oMA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml - pillow fonttools + pillow ]; nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - qrcode camelot - uharfbuzz lxml + pytest-cov-stub + pytestCheckHook + qrcode + uharfbuzz ]; disabledTestPaths = [ From 4f2529ac468accc26a5b02fcbb45fd9c3ee13698 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Aug 2025 10:25:38 +0200 Subject: [PATCH 2/2] python313Packages.fpdf2: add missing input --- pkgs/development/python-modules/fpdf2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix index f2c6bd602056..6ed3c3b46f90 100644 --- a/pkgs/development/python-modules/fpdf2/default.nix +++ b/pkgs/development/python-modules/fpdf2/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, fonttools, lxml, + pikepdf, pillow, pytest-cov-stub, pytestCheckHook, @@ -37,6 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ camelot lxml + pikepdf pytest-cov-stub pytestCheckHook qrcode