From af21158e025c64ff6095e8d1de5b15d341cf4d91 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Jul 2024 22:00:11 +0200 Subject: [PATCH 1/2] python3.pkgs.inkex: Fix build This got broken by Python 3.12 bump. --- pkgs/development/python-modules/inkex/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 15aaddd0069b8..154848eae3510 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, inkscape, + fetchpatch, poetry-core, cssselect, lxml, @@ -25,6 +26,17 @@ buildPythonPackage { inherit (inkscape) src; + patches = [ + # Fix “distribute along path” test with Python 3.12. + # https://gitlab.com/inkscape/extensions/-/issues/580 + (fetchpatch { + url = "https://gitlab.com/inkscape/extensions/-/commit/c576043c195cd044bdfc975e6367afb9b655eb14.patch"; + extraPrefix = "share/extensions/"; + stripLen = 1; + hash = "sha256-D9HxBx8RNkD7hHuExJqdu3oqlrXX6IOUw9m9Gx6+Dr8="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ From c8ceed2cf3d65e3a2a759b35175d65c0eb8bd063 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Jul 2024 22:00:11 +0200 Subject: [PATCH 2/2] inkscape: Improve precision of distribute along path We are already applying this patch to inkex. --- pkgs/applications/graphics/inkscape/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index c285fc3116401..81cd91ebb6b0b 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -101,6 +101,15 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/inkscape/inkscape/-/commit/694d8ae43d06efff21adebf377ce614d660b24cd.patch"; hash = "sha256-9IXJzpZbNU5fnt7XKgqCzUDrwr08qxGwo8TqnL+xc6E="; }) + + # Improve distribute along path precision + # https://gitlab.com/inkscape/extensions/-/issues/580 + (fetchpatch { + url = "https://gitlab.com/inkscape/extensions/-/commit/c576043c195cd044bdfc975e6367afb9b655eb14.patch"; + extraPrefix = "share/extensions/"; + stripLen = 1; + hash = "sha256-D9HxBx8RNkD7hHuExJqdu3oqlrXX6IOUw9m9Gx6+Dr8="; + }) ]; postPatch = ''