From 58fce4e2709ba02b1cc179bef8facb087906a704 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 28 Apr 2021 08:16:12 +0200 Subject: [PATCH] =?UTF-8?q?gimp:=202.10.22=20=E2=86=92=202.10.24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.gimp.org/news/2021/03/29/gimp-2-10-24-released/ --- pkgs/applications/graphics/gimp/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 2491d8d3a8ab..08d3f122aab5 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , substituteAll , autoreconfHook , pkg-config @@ -34,6 +33,7 @@ , libexif , gettext , makeWrapper +, gtk-doc , xorg , glib-networking , libmypaint @@ -53,13 +53,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.22"; + version = "2.10.24"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d"; + sha256 = "17lq6ns5qhspd171zqh76yf98xnn5n0hcl7hbhbx63cc6ribf6xx"; }; patches = [ @@ -73,12 +73,6 @@ in stdenv.mkDerivation rec { # Use absolute paths instead of relying on PATH # to make sure plug-ins are loaded by the correct interpreter. ./hardcode-plugin-interpreters.patch - - # Fix crash without dot. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04.patch"; - sha256 = "POuvBhOSStO7hBGp4HgNx5F9pElFRoqN3W+i3u4zOnk="; - }) ]; nativeBuildInputs = [ @@ -87,6 +81,7 @@ in stdenv.mkDerivation rec { intltool gettext makeWrapper + gtk-doc ]; buildInputs = [