talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

gimp: Switch back go GIMP 2

Browse Source 
Temporarily, rename `gimp` to `gimp3` and `gimp2` back to `gimp`.

Revert once GIMP 3 works on Darwin again and performance regressions are debugged.
This commit is contained in:
Jan Tojnar 2025-04-02 01:05:57 +02:00
parent 9a6a23bd11
commit bc17b33471
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release-notes/rl-2505.section.md
View File

@ -62,7 +62,7 @@
- [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided. - [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. 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/). Most plug-ins are not compatible so the old version has been preserved as `gimp2`, `gimp2Plugins` and `gimp2-with-plugins`. - [GIMP 3.0](https://www.gimp.org/news/2025/03/16/gimp-3-0-released/) available as `gimp3`.
- `grafana-agent` and `services.grafana-agent` have been removed in favor of - `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 Grafana Alloy (`grafana-alloy` and `services.alloy`), as they depend on an EOL compiler version

36
pkgs/top-level/all-packages.nix
View File

@ -14543,7 +14543,24 @@ with pkgs;
inherit (xorg) xlsfonts; inherit (xorg) xlsfonts;
gimp = callPackage ../applications/graphics/gimp { gimp3 = callPackage ../applications/graphics/gimp {
lcms = lcms2;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
gimp3-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix {
gimpPlugins = gimp3Plugins;
plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied
};
gimp3Plugins = recurseIntoAttrs (
callPackage ../applications/graphics/gimp/plugins {
gimp = gimp3;
}
);
gimp = callPackage ../applications/graphics/gimp/2.0 {
autoreconfHook = buildPackages.autoreconfHook269;
lcms = lcms2; lcms = lcms2;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
}; };
@ -14554,23 +14571,6 @@ with pkgs;
gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins { }); gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins { });
gimp2 = callPackage ../applications/graphics/gimp/2.0 {
autoreconfHook = buildPackages.autoreconfHook269;
lcms = lcms2;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
gimp2-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix {
gimpPlugins = gimp2Plugins;
plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied
};
gimp2Plugins = recurseIntoAttrs (
callPackage ../applications/graphics/gimp/plugins {
gimp = gimp2;
}
);
girara = callPackage ../applications/misc/girara { girara = callPackage ../applications/misc/girara {
gtk = gtk3; gtk = gtk3;
}; };