diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 475ce0b4897e..afb0ab092652 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -74,11 +74,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "inkscape"; - version = "1.4"; + version = "1.4.1"; src = fetchurl { url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-xZqFRTtpmt3rzVHB3AdoTdlqEMiuxxaxlVHbUFYuE/U="; + sha256 = "sha256-dHlqivThSg1dXBzFjT7B6m1IigQwbdbo0ywR8HSNcjI="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -88,12 +88,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; patches = [ - (fetchpatch { - # fix typo in gobjectptr member function. remove on update - name = "gobjectptr-fix-member-name.patch"; - url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch"; - hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q="; - }) (replaceVars ./fix-python-paths.patch { # Python is used at run-time to execute scripts, # e.g., those from the "Effects" menu. diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 542cb22f335a..1b3b5f236f96 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -7,7 +7,6 @@ cssselect, lxml, numpy, - packaging, pillow, pygobject3, pyparsing, @@ -17,7 +16,6 @@ gobject-introspection, pytestCheckHook, gtk3, - fetchpatch2, }: buildPythonPackage { @@ -27,16 +25,6 @@ buildPythonPackage { inherit (inkscape) src; - patches = [ - (fetchpatch2 { - name = "add-numpy-2-support.patch"; - url = "https://gitlab.com/inkscape/extensions/-/commit/13ebc1e957573fea2c3360f676b0f1680fad395d.patch"; - hash = "sha256-0n8L8dUaYYPBsmHlAxd60c5zqfK6NmXJfWZVBXPbiek="; - stripLen = 1; - extraPrefix = "share/extensions/"; - }) - ]; - build-system = [ poetry-core ]; pythonRelaxDeps = [ "numpy" ];