From 4c9a58643fcf87f36d8ef57604f318aca6bab2be Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 13 Dec 2022 01:16:57 +0100 Subject: [PATCH 1/2] =?UTF-8?q?lib2geom:=201.2=20=E2=86=92=201.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/lib2geom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index 72d21ed0d2c4..fba331ee67be 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "lib2geom"; - version = "1.2"; + version = "1.2.2"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "inkscape"; repo = "lib2geom"; rev = "refs/tags/${version}"; - sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc="; + sha256 = "sha256-xkUxcAk8KJkL482R7pvgmCT+5I8aUMm/q25pvK3ZPuY="; }; nativeBuildInputs = [ From 3b3f77b1815388c6a320265ea4262dadb47914ed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 13 Dec 2022 01:17:12 +0100 Subject: [PATCH 2/2] =?UTF-8?q?inkscape:=201.2.1=20=E2=86=92=201.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://inkscape.org/news/2022/12/05/download-inkscape-122/ --- pkgs/applications/graphics/inkscape/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 = ''