···1---- a/libdeja/tools/duplicity/DuplicityInstance.vala
2-+++ b/libdeja/tools/duplicity/DuplicityInstance.vala
3-@@ -159,7 +159,7 @@
4 // We already are pretty sure we don't have other duplicities in our
5 // archive directories, because we use our own and we ensure we only have
6 // one deja-dup running at a time via DBus.
···1+--- a/libdeja/duplicity/DuplicityInstance.vala
2++++ b/libdeja/duplicity/DuplicityInstance.vala
3+@@ -114,7 +114,7 @@ internal class DuplicityInstance : Object
4 // We already are pretty sure we don't have other duplicities in our
5 // archive directories, because we use our own and we ensure we only have
6 // one deja-dup running at a time via DBus.
+2-34
pkgs/applications/graphics/inkscape/default.nix
···5, cairo
6, cmake
7, fetchurl
8-, fetchpatch
9, gettext
10, ghostscript
11, glib
···52in
53stdenv.mkDerivation rec {
54 pname = "inkscape";
55- version = "1.1.1";
5657 src = fetchurl {
58 url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
59- sha256 = "sha256-rsoLnTO1sc+pqnBDO97mqMPQIP+vwubwyaYO7Xp5eK8=";
60 };
6162 # Inkscape hits the ARGMAX when linking on macOS. It appears to be
···71 # Python is used at run-time to execute scripts,
72 # e.g., those from the "Effects" menu.
73 python3 = "${python3Env}/bin/python";
74- })
75-76- # Fix parsing paths by Python extensions.
77- # https://gitlab.com/inkscape/extensions/-/merge_requests/342
78- (fetchpatch {
79- url = "https://gitlab.com/inkscape/extensions/-/commit/a82c382c610d37837c8f3f5b13224bab8fd3667e.patch";
80- sha256 = "YWrgjCnQ9q6BUsxSLQojIXnDzPxM/SgrIfj1gxQ/JKM=";
81- stripLen = 1;
82- extraPrefix = "share/extensions/";
83- })
84-85- # Fix build with Poppler 21.11.0.
86- # https://gitlab.com/inkscape/inkscape/-/merge_requests/3622
87- (fetchpatch {
88- url = "https://gitlab.com/inkscape/inkscape/-/commit/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch";
89- sha256 = "/1p/Vkes1HuZN0v09Ey4kiT+4zrEaoSXyPAmc4O3sDg=";
90- })
91-92- # Remove mandatory break from end of paragraphs, added in Pango 1.49
93- # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630
94- # TODO: Remove in Inkscape 1.1.2
95- (fetchpatch {
96- url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch";
97- sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng=";
98- })
99- # Fix build against gcc-12
100- # https://gitlab.com/inkscape/inkscape/-/merge_requests/3683
101- (fetchpatch {
102- name = "gcc-12.patch";
103- url = "https://gitlab.com/inkscape/inkscape/-/commit/3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch";
104- sha256 = "sha256-VzKrWCkcVA1Co/xBTyh28Zhm2zFE/2jfZ3LveK0raO4=";
105 })
106 ];
107
···5, cairo
6, cmake
7, fetchurl
08, gettext
9, ghostscript
10, glib
···51in
52stdenv.mkDerivation rec {
53 pname = "inkscape";
54+ version = "1.1.2";
5556 src = fetchurl {
57 url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz";
58+ sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE=";
59 };
6061 # Inkscape hits the ARGMAX when linking on macOS. It appears to be
···70 # Python is used at run-time to execute scripts,
71 # e.g., those from the "Effects" menu.
72 python3 = "${python3Env}/bin/python";
000000000000000000000000000000073 })
74 ];
75