From 79e6d159bf967f31c64b67b01f06e2298c105545 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 18 Mar 2025 10:11:13 +0100 Subject: [PATCH] =?UTF-8?q?gimp:=203.0.0-RC2=20=E2=86=92=203.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.gimp.org/news/2025/03/16/gimp-3-0-released/ https://github.com/GNOME/gimp/compare/GIMP_3_0_0_RC2...GIMP_3_0_0 https://www.gimp.org/news/2025/03/23/gimp-3-0-2-released/ https://github.com/GNOME/gimp/compare/GIMP_3_0_0...GIMP_3_0_2 --- doc/release-notes/rl-2505.section.md | 2 ++ pkgs/applications/graphics/gimp/default.nix | 12 ++---------- .../graphics/gimp/remove-cc-reference.patch | 2 +- .../applications/graphics/gimp/tests-dbus-conf.patch | 2 -- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 8294606c917f..933cf114ec1c 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -62,6 +62,8 @@ - [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided. The `name` argument will become mandatory in a future release. +- `gimp` has been upgraded to [GIMP 3.0](https://www.gimp.org/news/2025/03/16/gimp-3-0-released/). + - `grafana-agent` and `services.grafana-agent` have been removed in favor of Grafana Alloy (`grafana-alloy` and `services.alloy`), as they depend on an EOL compiler version and will become EOL during the 25.05 lifecycle. diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 114a5ba7ec28..0b2406c89f8b 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchurl, - fetchpatch, replaceVars, meson, ninja, @@ -80,7 +79,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "3.0.0-RC2"; + version = "3.0.2"; outputs = [ "out" @@ -90,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz"; - hash = "sha256-9NL5bfGAzlVD+LKzVwe5vxFFnwD3Jspz2i9AbWhtnbc="; + hash = "sha256-VG3cMMstDnkSPH/LTXghHh7npqrOkaagrYy8v26lcaI="; }; patches = [ @@ -113,13 +112,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./tests-dbus-conf.patch { session_conf = "${dbus.out}/share/dbus-1/session.conf"; }) - - # Fix pkg-config file. - # https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2037 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/a18e1806dbc9b180aefabb2c0fae43493f1ef14a.patch"; - hash = "sha256-BUrPm9lB/aiybB2Sd3TKlJ+59ITMZlNUBXJP5ZdLQ44="; - }) ]; nativeBuildInputs = diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch index 335fb4e44bb1..8b62b801f02b 100644 --- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch +++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch @@ -2,7 +2,7 @@ diff --git a/app/gimp-version.c b/app/gimp-version.c index 6e311c8252..e6fd9d1d78 100644 --- a/app/gimp-version.c +++ b/app/gimp-version.c -@@ -231,7 +231,7 @@ gimp_version (gboolean be_verbose, +@@ -90,7 +90,7 @@ gimp_version (gboolean be_verbose, GIMP_BUILD_ID, gimp_version_get_revision (), GIMP_BUILD_PLATFORM_FAMILY, diff --git a/pkgs/applications/graphics/gimp/tests-dbus-conf.patch b/pkgs/applications/graphics/gimp/tests-dbus-conf.patch index 4553054b72cd..da9152eeef01 100644 --- a/pkgs/applications/graphics/gimp/tests-dbus-conf.patch +++ b/pkgs/applications/graphics/gimp/tests-dbus-conf.patch @@ -1,5 +1,3 @@ -diff --git a/build/meson/run_test_env.sh b/build/meson/run_test_env.sh -index a3fda14f00..71fbdcd00d 100644 --- a/build/meson/run_test_env.sh +++ b/build/meson/run_test_env.sh @@ -33,7 +33,7 @@ if [ -n "${UI_TEST}" ]; then