diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 87bb02820f9f..eea1a66df200 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -330,6 +330,8 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325). - `firezone` has changed how the `Everyone` group behaves. Service Accounts are no longer considered part of `Everyone`. +- The `file-roller` module has been removed due to not being required for function, file roller itself has also been removed from the `services.desktopManager.gnome` module as it's not part of GNOME core applications. + - The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option. - Direct use of `pkgs.formats.systemd` has been deprecated, and should now be instantiated with `pkgs.formats.systemd { }` similarly to other items in `pkgs.formats`. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index de5978a41e78..70427e86fb3a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -209,7 +209,6 @@ ./programs/extra-container.nix ./programs/fcast-receiver.nix ./programs/feedbackd.nix - ./programs/file-roller.nix ./programs/firefox.nix ./programs/firejail.nix ./programs/fish.nix diff --git a/nixos/modules/programs/file-roller.nix b/nixos/modules/programs/file-roller.nix deleted file mode 100644 index d37825558e4a..000000000000 --- a/nixos/modules/programs/file-roller.nix +++ /dev/null @@ -1,40 +0,0 @@ -# File Roller. - -{ - config, - pkgs, - lib, - ... -}: - -let - cfg = config.programs.file-roller; - -in -{ - - ###### interface - - options = { - - programs.file-roller = { - - enable = lib.mkEnableOption "File Roller, an archive manager for GNOME"; - - package = lib.mkPackageOption pkgs "file-roller" { }; - - }; - - }; - - ###### implementation - - config = lib.mkIf cfg.enable { - - environment.systemPackages = [ cfg.package ]; - - services.dbus.packages = [ cfg.package ]; - - }; - -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index d7759c232fea..16e1410f72e8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -75,6 +75,10 @@ in "programs" "goldwarden" ] "'goldwarden' has been removed from nixpkgs.") + (mkRemovedOptionModule [ + "programs" + "file-roller" + ] "Not required for the package to function anymore, use `pkgs.file-roller` instead.") (mkRemovedOptionModule [ "programs" "pantheon-tweaks" ] '' pantheon-tweaks is no longer a switchboard plugin but an independent app, adding the package to environment.systemPackages is sufficient. diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index faa5085cc9e7..0cc84d435766 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -477,7 +477,6 @@ in # Since some of these have a corresponding package, we only # enable that program module if the package hasn't been excluded # through `environment.gnome.excludePackages` - programs.file-roller.enable = notExcluded pkgs.file-roller; programs.geary.enable = notExcluded pkgs.geary; programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility; programs.seahorse.enable = notExcluded pkgs.seahorse; diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix index 89713e7e9212..e24bf4d9ae1e 100644 --- a/nixos/modules/services/desktop-managers/pantheon.nix +++ b/nixos/modules/services/desktop-managers/pantheon.nix @@ -307,11 +307,11 @@ in (mkIf serviceCfg.apps.enable { programs.evince.enable = mkDefault (notExcluded pkgs.evince); - programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller); environment.systemPackages = utils.removePackagesByName ( [ pkgs.gnome-font-viewer + pkgs.file-roller ] ++ ( with pkgs.pantheon; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index e10cf1f47c3e..6b118a769e33 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -250,7 +250,6 @@ in (mkIf serviceCfg.apps.enable { programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility); programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal); - programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller); environment.systemPackages = with pkgs; @@ -270,6 +269,7 @@ in gnome-calculator gnome-calendar gnome-screenshot + file-roller ] config.environment.cinnamon.excludePackages; }) ];