From 53b415a9873e0d2e4053e596dce37887f429c2af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jan 2026 23:33:28 +0100 Subject: [PATCH 1/2] python313Packages.drawsvg: modernize --- .../python-modules/drawsvg/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix index 2360b947dee74..2d1755dbc2f0b 100644 --- a/pkgs/development/python-modules/drawsvg/default.nix +++ b/pkgs/development/python-modules/drawsvg/default.nix @@ -1,14 +1,13 @@ { lib, buildPythonPackage, - fetchFromGitHub, - setuptools, - pythonOlder, - numpy, - imageio, cairosvg, + fetchFromGitHub, imageio-ffmpeg, + imageio, + numpy, pwkit, + setuptools, }: buildPythonPackage rec { @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "cduck"; repo = "drawsvg"; @@ -29,21 +26,21 @@ buildPythonPackage rec { optional-dependencies = { all = [ - numpy - imageio cairosvg + imageio imageio-ffmpeg + numpy pwkit ]; raster = [ - numpy - imageio cairosvg + imageio imageio-ffmpeg + numpy ]; color = [ - pwkit numpy + pwkit ]; }; From 457ef782e0fa2a382371887ec78172b31ee77897 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Jan 2026 13:05:17 +0100 Subject: [PATCH 2/2] python313Packages.drawsvg: migrate to finalAttrs --- pkgs/development/python-modules/drawsvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix index 2d1755dbc2f0b..cb8f1d7a4adc1 100644 --- a/pkgs/development/python-modules/drawsvg/default.nix +++ b/pkgs/development/python-modules/drawsvg/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "drawsvg"; version = "2.4.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cduck"; repo = "drawsvg"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JC7u6bEB7RCJVLeYnNqACmddLI5F5PyaaBxaAZ+N/5s="; }; @@ -55,4 +55,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +})