From 79618982937dd9cb2eb9e70165d94f875c074b41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 08:51:27 +0100 Subject: [PATCH] python312Packages.willow: refactor - add changelog to meta - disable on unsupported Python releases - remove superfluous comments --- .../python-modules/willow/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 13396dad5541..367a615f9c27 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,30 +1,25 @@ { lib, buildPythonPackage, - fetchFromGitHub, - - # build-system - flit-core, - - # dependencies - filetype, defusedxml, - - # optional-dependencies - pillow-heif, - - # tests + fetchFromGitHub, + filetype, + flit-core, numpy, opencv4, + pillow-heif, pillow, pytestCheckHook, + pythonOlder, wand, }: buildPythonPackage rec { pname = "willow"; version = "1.9.0"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "wagtail"; @@ -33,11 +28,11 @@ buildPythonPackage rec { hash = "sha256-H/UXE6gA6x849aqBcUgl3JYZ87OMNpuFyWGSsgqW1Rk="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; pythonRelaxDeps = [ "defusedxml" ]; - propagatedBuildInputs = [ + dependencies = [ filetype defusedxml ]; @@ -57,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python image library that sits on top of Pillow, Wand and OpenCV"; homepage = "https://github.com/torchbox/Willow/"; + changelog = "https://github.com/wagtail/Willow/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; };