diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index b29ecaa1c829..a984da6d2989 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -9,10 +9,10 @@ -- `xfce.mkXfceDerivation` has been deprecated, please use `stdenv.mkDerivation` - directly. You can migrate by adding `pkg-config`, `xfce4-dev-tools`, and - `wrapGAppsHook3` to your `nativeBuildInputs` and `--enable-maintainer-mode` - to your `configureFlags`. +- `xfce.mkXfceDerivation` has been deprecated (i.e. conditioned behind `nixpkgs.config.allowAliases`) + and will be removed in NixOS 26.11, please use `stdenv.mkDerivation` directly. You can migrate by + adding `pkg-config`, `xfce4-dev-tools`, and `wrapGAppsHook3` to your `nativeBuildInputs` and + `--enable-maintainer-mode` to your `configureFlags`. - `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js. @@ -62,7 +62,7 @@ - `services.openssh.settings.AcceptEnv` now explicitly defined as an option that takes a list of strings, to facilitate option merging. Setting it to a string value is no longer supported. -- Xfce panel plugins have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). +- All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11. ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes} diff --git a/nixos/doc/manual/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md index 302cf9fa093d..59ef7de0c0be 100644 --- a/nixos/doc/manual/configuration/xfce.chapter.md +++ b/nixos/doc/manual/configuration/xfce.chapter.md @@ -26,14 +26,14 @@ example settings: Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your -[](#opt-environment.systemPackages) from `pkgs.xfce`. +[](#opt-environment.systemPackages). ## Thunar {#sec-xfce-thunar-plugins} Thunar (the Xfce file manager) is automatically enabled when Xfce is enabled. To enable Thunar without enabling Xfce, use the configuration option [](#opt-programs.thunar.enable) instead of adding -`pkgs.xfce.thunar` to [](#opt-environment.systemPackages). +`pkgs.thunar` to [](#opt-environment.systemPackages). If you'd like to add extra plugins to Thunar, add them to [](#opt-programs.thunar.plugins). You shouldn't just add them to