From dbafee5cd0f18d715418a7c1f06416fbfc160f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Oct 2025 08:17:33 -0700 Subject: [PATCH] gimp: 2.10.38 -> 3.0.4 --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 12 ++++++------ pkgs/top-level/release.nix | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index c6195a3017c1..32ad3bac660e 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -222,6 +222,8 @@ - [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update. +- GIMP now defaults to version 3. Use `gimp2` for the old version. + - `installShellCompletion`: now supports Nushell completion files - New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b6ace8d86b57..cab3efc7ed9c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1014,6 +1014,9 @@ mapAliases { gg = go-graft; # Added 2025-03-07 ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18 ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18 + gimp3 = gimp; # added 2025-10-03 + gimp3-with-plugins = gimp-with-plugins; # added 2025-10-03 + gimp3Plugins = gimpPlugins; # added 2025-10-03 git-annex-utils = throw "'git-annex-utils' has been removed as it is unmaintained"; # Added 2025-05-18 git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 069ee2a27620..662cc6dfe5b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11471,22 +11471,22 @@ with pkgs; freeoffice ; - gimp3 = callPackage ../applications/graphics/gimp { + gimp2 = callPackage ../applications/graphics/gimp/2.0 { lcms = lcms2; }; - gimp3-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { - gimpPlugins = gimp3Plugins; + gimp2-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { + gimpPlugins = gimp2Plugins; plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied }; - gimp3Plugins = recurseIntoAttrs ( + gimp2Plugins = recurseIntoAttrs ( callPackage ../applications/graphics/gimp/plugins { - gimp = gimp3; + gimp = gimp2; } ); - gimp = callPackage ../applications/graphics/gimp/2.0 { + gimp = callPackage ../applications/graphics/gimp { lcms = lcms2; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ff45ccee7bce..24bf814ac472 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -151,7 +151,7 @@ let # jobs.firefox-unwrapped.x86_64-darwin jobs.qt5.qtmultimedia.x86_64-darwin jobs.inkscape.x86_64-darwin - jobs.gimp.x86_64-darwin + jobs.gimp2.x86_64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved jobs.emacs.x86_64-darwin jobs.wireshark.x86_64-darwin jobs.transmission_3-gtk.x86_64-darwin @@ -195,7 +195,7 @@ let # jobs.firefox-unwrapped.aarch64-darwin jobs.qt5.qtmultimedia.aarch64-darwin jobs.inkscape.aarch64-darwin - jobs.gimp.aarch64-darwin + jobs.gimp2.aarch64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved jobs.emacs.aarch64-darwin jobs.wireshark.aarch64-darwin jobs.transmission_3-gtk.aarch64-darwin