diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-09 23:55:51 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-02-09 23:55:55 +0100 |
commit | 8d21cfcf7ffc94cd9896d16cda163038d00413da (patch) | |
tree | f863d1b6cca3a38cb7b8975c502d98b6abe9d30d /pkgs/applications/graphics/inkscape | |
parent | c4384583ea0cfdc5ca64f58b9597dc2e3495f928 (diff) |
inkscape: 1.1.1 → 1.1.2
https://inkscape.org/release/inkscape-1.1.2/
Diffstat (limited to 'pkgs/applications/graphics/inkscape')
-rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 271173a8b027c..12d6332af5d50 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 @@ -52,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "sha256-rsoLnTO1sc+pqnBDO97mqMPQIP+vwubwyaYO7Xp5eK8="; + sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -72,37 +71,6 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) - - # Fix parsing paths by Python extensions. - # https://gitlab.com/inkscape/extensions/-/merge_requests/342 - (fetchpatch { - url = "https://gitlab.com/inkscape/extensions/-/commit/a82c382c610d37837c8f3f5b13224bab8fd3667e.patch"; - sha256 = "YWrgjCnQ9q6BUsxSLQojIXnDzPxM/SgrIfj1gxQ/JKM="; - stripLen = 1; - extraPrefix = "share/extensions/"; - }) - - # Fix build with Poppler 21.11.0. - # https://gitlab.com/inkscape/inkscape/-/merge_requests/3622 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch"; - sha256 = "/1p/Vkes1HuZN0v09Ey4kiT+4zrEaoSXyPAmc4O3sDg="; - }) - - # Remove mandatory break from end of paragraphs, added in Pango 1.49 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630 - # TODO: Remove in Inkscape 1.1.2 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch"; - sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng="; - }) - # Fix build against gcc-12 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/3683 - (fetchpatch { - name = "gcc-12.patch"; - url = "https://gitlab.com/inkscape/inkscape/-/commit/3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch"; - sha256 = "sha256-VzKrWCkcVA1Co/xBTyh28Zhm2zFE/2jfZ3LveK0raO4="; - }) ]; postPatch = '' |