From 7c846eb3ca367dbd1995c0b71f106d2861367038 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 16 Oct 2023 18:10:41 +0900 Subject: [PATCH 1/2] python311Packages.pilkit: unstable-2022-02-17 -> 3.0 Diff: https://github.com/matthewwithanm/pilkit/compare/09ffa2ad33318ae5fd3464655c14c7f01ffc2097...3.0 --- pkgs/development/python-modules/pilkit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 1b17e2411536..2ca211f75c9c 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pilkit"; - version = "unstable-2022-02-17"; + version = "3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthewwithanm"; repo = pname; - rev = "09ffa2ad33318ae5fd3464655c14c7f01ffc2097"; - hash = "sha256-jtnFffKr0yhSv2jBmXzPa6iP2r41MbmGukfmnvgABhk="; + rev = "refs/tags/${version}"; + hash = "sha256-NmD9PFCkz3lz4AnGoQUpkt35q0zvDVm+kx7lVDFBcHk="; }; - buildInputs = [ + propagatedBuildInputs = [ pillow ]; From 8113dbcf2e2544236cba28d359cb32b809dd0a59 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 17 Oct 2023 15:56:04 +0900 Subject: [PATCH 2/2] python311Packages.pilkit: change the license to BSD3 and adopt `pyproject = true` --- pkgs/development/python-modules/pilkit/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 2ca211f75c9c..76f6238349a5 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -5,12 +5,13 @@ , pillow , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pilkit"; version = "3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-NmD9PFCkz3lz4AnGoQUpkt35q0zvDVm+kx7lVDFBcHk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pillow ]; @@ -44,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A collection of utilities and processors for the Python Imaging Library"; homepage = "https://github.com/matthewwithanm/pilkit/"; - license = licenses.bsd0; + license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; }; }