diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 62f485ff916ee..01d1d460760b5 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -6,8 +6,8 @@ , callPackage , cmake , desktopToDarwinBundle +, double-conversion , fetchurl -, fetchpatch , gettext , ghostscript , glib @@ -65,15 +65,16 @@ let pyserial requests pygobject3 + tinycss2 ] ++ inkex.propagatedBuildInputs); in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.3.2"; + version = "1.4"; src = fetchurl { url = "https://inkscape.org/release/inkscape-${version}/source/archive/xz/dl/inkscape-${version}.tar.xz"; - sha256 = "sha256-29GETcRD/l4Q0+mohxROX7ciOFL/8ZHPte963qsOCGs="; + sha256 = "sha256-xZqFRTtpmt3rzVHB3AdoTdlqEMiuxxaxlVHbUFYuE/U="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -94,22 +95,6 @@ stdenv.mkDerivation rec { src = ./fix-ps2pdf-path.patch; inherit ghostscript; }) - - # Fix build with libxml2 2.12 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/6089 - (fetchpatch { - 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 = '' @@ -141,6 +126,7 @@ stdenv.mkDerivation rec { buildInputs = [ boehmgc boost + double-conversion gettext glib glibmm @@ -184,12 +170,15 @@ stdenv.mkDerivation rec { passthru.tests.ps2pdf-plugin = callPackage ./test-ps2pdf-plugin.nix { }; - meta = with lib; { + meta = { description = "Vector graphics editor"; homepage = "https://www.inkscape.org"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.jtojnar ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + jtojnar + x123 + ]; + platforms = lib.platforms.all; mainProgram = "inkscape"; longDescription = '' Inkscape is a feature-rich vector graphics editor that edits diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 2435c7e467868..6a7ad0bf4d05d 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, inkscape, - fetchpatch, poetry-core, cssselect, lxml, @@ -14,6 +13,7 @@ pyparsing, pyserial, scour, + tinycss2, gobject-introspection, pytestCheckHook, gtk3, @@ -27,17 +27,6 @@ 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 = [ @@ -46,6 +35,7 @@ buildPythonPackage { numpy pygobject3 pyserial + tinycss2 ]; pythonImportsCheck = [ "inkex" ]; @@ -88,7 +78,6 @@ buildPythonPackage { substituteInPlace pyproject.toml \ --replace-fail 'scour = "^0.37"' 'scour = ">=0.37"' \ - --replace-fail 'lxml = "^4.5.0"' 'lxml = "^4.5.0 || ^5.0.0"' ''; meta = { diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index e295f2bdc6eab..8bca3e905cbdf 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -51,5 +51,6 @@ buildPythonPackage rec { dotlambda gal_bolle ]; + broken = true; }; }