···11---- a/libdeja/tools/duplicity/DuplicityInstance.vala
22-+++ b/libdeja/tools/duplicity/DuplicityInstance.vala
33-@@ -159,7 +159,7 @@
11+--- a/libdeja/duplicity/DuplicityInstance.vala
22++++ b/libdeja/duplicity/DuplicityInstance.vala
33+@@ -114,7 +114,7 @@ internal class DuplicityInstance : Object
44 // We already are pretty sure we don't have other duplicities in our
55 // archive directories, because we use our own and we ensure we only have
66 // one deja-dup running at a time via DBus.
+2-34
pkgs/applications/graphics/inkscape/default.nix
···55, cairo
66, cmake
77, fetchurl
88-, fetchpatch
98, gettext
109, ghostscript
1110, glib
···5251in
5352stdenv.mkDerivation rec {
5453 pname = "inkscape";
5555- version = "1.1.1";
5454+ version = "1.1.2";
56555756 src = fetchurl {
5857 url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
5959- sha256 = "sha256-rsoLnTO1sc+pqnBDO97mqMPQIP+vwubwyaYO7Xp5eK8=";
5858+ sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE=";
6059 };
61606261 # Inkscape hits the ARGMAX when linking on macOS. It appears to be
···7170 # Python is used at run-time to execute scripts,
7271 # e.g., those from the "Effects" menu.
7372 python3 = "${python3Env}/bin/python";
7474- })
7575-7676- # Fix parsing paths by Python extensions.
7777- # https://gitlab.com/inkscape/extensions/-/merge_requests/342
7878- (fetchpatch {
7979- url = "https://gitlab.com/inkscape/extensions/-/commit/a82c382c610d37837c8f3f5b13224bab8fd3667e.patch";
8080- sha256 = "YWrgjCnQ9q6BUsxSLQojIXnDzPxM/SgrIfj1gxQ/JKM=";
8181- stripLen = 1;
8282- extraPrefix = "share/extensions/";
8383- })
8484-8585- # Fix build with Poppler 21.11.0.
8686- # https://gitlab.com/inkscape/inkscape/-/merge_requests/3622
8787- (fetchpatch {
8888- url = "https://gitlab.com/inkscape/inkscape/-/commit/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch";
8989- sha256 = "/1p/Vkes1HuZN0v09Ey4kiT+4zrEaoSXyPAmc4O3sDg=";
9090- })
9191-9292- # Remove mandatory break from end of paragraphs, added in Pango 1.49
9393- # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630
9494- # TODO: Remove in Inkscape 1.1.2
9595- (fetchpatch {
9696- url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch";
9797- sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng=";
9898- })
9999- # Fix build against gcc-12
100100- # https://gitlab.com/inkscape/inkscape/-/merge_requests/3683
101101- (fetchpatch {
102102- name = "gcc-12.patch";
103103- url = "https://gitlab.com/inkscape/inkscape/-/commit/3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch";
104104- sha256 = "sha256-VzKrWCkcVA1Co/xBTyh28Zhm2zFE/2jfZ3LveK0raO4=";
10573 })
10674 ];
10775