diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 8a40bac446e8..6444537cac29 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,7 +5,6 @@ , cairo , cmake , fetchurl -, fetchpatch , gettext , ghostscript , glib @@ -59,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"; - sha256 = "Rs59oOunykutwdtw6cu2fgrfm7NCaH3G4ItcohuNTBs="; + sha256 = "oMf9DQPAohU15kjvMB3PgN18/B81ReUQZfvxuj7opcQ="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -79,12 +78,6 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) - - # Fix build with Poppler 22.09 - (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/b2f65dfb60ae0c8cd6cd9affd3d71064082a6201/trunk/inkscape-1.2.1-poppler-22.09.0.patch"; - sha256 = "pArvsS/qoCTMAisF8yj3agZKrb90zRFZkck1TX0KeGc="; - }) ]; postPatch = '' diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index b09e7dcb739a..6e5f6944f497 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "lib2geom"; - version = "1.2"; + version = "1.2.2"; outputs = [ "out" "dev" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "inkscape"; repo = "lib2geom"; rev = "refs/tags/${version}"; - sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc="; + sha256 = "sha256-xkUxcAk8KJkL482R7pvgmCT+5I8aUMm/q25pvK3ZPuY="; }; patches = [