nixos/file-roller: drop (#440775)
This commit is contained in:
@@ -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`.
|
- `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.
|
- 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`.
|
- 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`.
|
||||||
|
|||||||
@@ -209,7 +209,6 @@
|
|||||||
./programs/extra-container.nix
|
./programs/extra-container.nix
|
||||||
./programs/fcast-receiver.nix
|
./programs/fcast-receiver.nix
|
||||||
./programs/feedbackd.nix
|
./programs/feedbackd.nix
|
||||||
./programs/file-roller.nix
|
|
||||||
./programs/firefox.nix
|
./programs/firefox.nix
|
||||||
./programs/firejail.nix
|
./programs/firejail.nix
|
||||||
./programs/fish.nix
|
./programs/fish.nix
|
||||||
|
|||||||
@@ -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 ];
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -75,6 +75,10 @@ in
|
|||||||
"programs"
|
"programs"
|
||||||
"goldwarden"
|
"goldwarden"
|
||||||
] "'goldwarden' has been removed from nixpkgs.")
|
] "'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" ] ''
|
(mkRemovedOptionModule [ "programs" "pantheon-tweaks" ] ''
|
||||||
pantheon-tweaks is no longer a switchboard plugin but an independent app,
|
pantheon-tweaks is no longer a switchboard plugin but an independent app,
|
||||||
adding the package to environment.systemPackages is sufficient.
|
adding the package to environment.systemPackages is sufficient.
|
||||||
|
|||||||
@@ -477,7 +477,6 @@ in
|
|||||||
# Since some of these have a corresponding package, we only
|
# Since some of these have a corresponding package, we only
|
||||||
# enable that program module if the package hasn't been excluded
|
# enable that program module if the package hasn't been excluded
|
||||||
# through `environment.gnome.excludePackages`
|
# through `environment.gnome.excludePackages`
|
||||||
programs.file-roller.enable = notExcluded pkgs.file-roller;
|
|
||||||
programs.geary.enable = notExcluded pkgs.geary;
|
programs.geary.enable = notExcluded pkgs.geary;
|
||||||
programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility;
|
programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility;
|
||||||
programs.seahorse.enable = notExcluded pkgs.seahorse;
|
programs.seahorse.enable = notExcluded pkgs.seahorse;
|
||||||
|
|||||||
@@ -307,11 +307,11 @@ in
|
|||||||
|
|
||||||
(mkIf serviceCfg.apps.enable {
|
(mkIf serviceCfg.apps.enable {
|
||||||
programs.evince.enable = mkDefault (notExcluded pkgs.evince);
|
programs.evince.enable = mkDefault (notExcluded pkgs.evince);
|
||||||
programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
|
|
||||||
|
|
||||||
environment.systemPackages = utils.removePackagesByName (
|
environment.systemPackages = utils.removePackagesByName (
|
||||||
[
|
[
|
||||||
pkgs.gnome-font-viewer
|
pkgs.gnome-font-viewer
|
||||||
|
pkgs.file-roller
|
||||||
]
|
]
|
||||||
++ (
|
++ (
|
||||||
with pkgs.pantheon;
|
with pkgs.pantheon;
|
||||||
|
|||||||
@@ -250,7 +250,6 @@ in
|
|||||||
(mkIf serviceCfg.apps.enable {
|
(mkIf serviceCfg.apps.enable {
|
||||||
programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility);
|
programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility);
|
||||||
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
|
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
|
||||||
programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
|
|
||||||
|
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
with pkgs;
|
with pkgs;
|
||||||
@@ -270,6 +269,7 @@ in
|
|||||||
gnome-calculator
|
gnome-calculator
|
||||||
gnome-calendar
|
gnome-calendar
|
||||||
gnome-screenshot
|
gnome-screenshot
|
||||||
|
file-roller
|
||||||
] config.environment.cinnamon.excludePackages;
|
] config.environment.cinnamon.excludePackages;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|||||||
Reference in New Issue
Block a user