From 07b0bee0fdfe11c1be860177cf2bc35e5a33441d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Sep 2024 04:27:14 +0000 Subject: [PATCH 1/3] python312Packages.psd-tools: 1.9.34 -> 1.10.0 --- pkgs/development/python-modules/psd-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index f6ffef6ea727..f16aadcb79ac 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.34"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UFdprXoHFsbH3Tbui44n8FTdbkynnYVL1LHtFzFInio="; + hash = "sha256-H3Szd8/NjXCkWyG/q+6O5L0Iq5u/g4UNdEmhDqQsAY8="; }; postPatch = '' From d8f146c8180d88259b8b1642cdded34d452dbea5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 29 Sep 2024 11:50:29 +0900 Subject: [PATCH 2/3] python312Packages.psd-tools: switch to pypa builder --- pkgs/development/python-modules/psd-tools/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index f16aadcb79ac..f59c1a5c329b 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, attrs, docopt, pillow, @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "psd-tools"; version = "1.10.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -34,9 +35,12 @@ buildPythonPackage rec { sed -i "/addopts =/d" pyproject.toml ''; - nativeBuildInputs = [ cython ]; + build-system = [ + setuptools + cython + ]; - propagatedBuildInputs = [ + dependencies = [ aggdraw attrs docopt From 8d31f5e0fe893ffc33570626f36956293757bb37 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 29 Sep 2024 11:53:07 +0900 Subject: [PATCH 3/3] python312Packages.psd-tools: refactor inputs --- pkgs/development/python-modules/psd-tools/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index f59c1a5c329b..9a5c0cf60fdc 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -12,7 +12,7 @@ numpy, aggdraw, pytestCheckHook, - pytest-cov, + pytest-cov-stub, ipython, cython, }: @@ -31,10 +31,6 @@ buildPythonPackage rec { hash = "sha256-H3Szd8/NjXCkWyG/q+6O5L0Iq5u/g4UNdEmhDqQsAY8="; }; - postPatch = '' - sed -i "/addopts =/d" pyproject.toml - ''; - build-system = [ setuptools cython @@ -44,7 +40,6 @@ buildPythonPackage rec { aggdraw attrs docopt - ipython numpy pillow scikit-image @@ -53,7 +48,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub + ipython ]; pythonImportsCheck = [ "psd_tools" ];