diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-14 06:01:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-14 06:01:15 +0000 |
| commit | 069038f0931658e6030876f37f81dfb6825f884c (patch) | |
| tree | fdc3ba751e099b40a039dfa1aa4422568f06b6fe /nixos | |
| parent | fc97883d63d5c3679be7a73d6b254fcbb938af4a (diff) | |
| parent | ce932dbcf14884c7c76888ebf8cf80f789250afd (diff) | |
| download | nixpkgs-069038f0931658e6030876f37f81dfb6825f884c.tar nixpkgs-069038f0931658e6030876f37f81dfb6825f884c.tar.gz nixpkgs-069038f0931658e6030876f37f81dfb6825f884c.tar.bz2 nixpkgs-069038f0931658e6030876f37f81dfb6825f884c.tar.lz nixpkgs-069038f0931658e6030876f37f81dfb6825f884c.tar.xz nixpkgs-069038f0931658e6030876f37f81dfb6825f884c.tar.zst nixpkgs-069038f0931658e6030876f37f81dfb6825f884c.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
4 files changed, 10 insertions, 10 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a8ec5d5e590..705dbec5e74 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -196,7 +196,7 @@ in programs.evince.enable = mkDefault true; programs.file-roller.enable = mkDefault true; - environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; lib.utils.removePackagesByName [ + environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ # cinnamon team apps bulky blueberry diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index d503cc271cf..258d39d4918 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -456,7 +456,7 @@ in (mkIf serviceCfg.core-utilities.enable { environment.systemPackages = with pkgs.gnome; - lib.utils.removePackagesByName + utils.removePackagesByName ([ baobab cheese @@ -516,7 +516,7 @@ in }) (mkIf serviceCfg.games.enable { - environment.systemPackages = with pkgs.gnome; lib.utils.removePackagesByName [ + environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ aisleriot atomix five-or-more @@ -542,7 +542,7 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst (mkIf serviceCfg.core-developer-tools.enable { - environment.systemPackages = with pkgs.gnome; lib.utils.removePackagesByName [ + environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ dconf-editor devhelp pkgs.gnome-builder diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 9c8bfab077a..1bc6c906c47 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -51,7 +51,7 @@ in environment.systemPackages = pkgs.lxqt.preRequisitePackages ++ pkgs.lxqt.corePackages ++ - (lib.utils.removePackagesByName + (utils.removePackagesByName pkgs.lxqt.optionalPackages config.environment.lxqt.excludePackages); diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index dd19d9cdff9..9ab4c6e7e98 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -47,7 +47,7 @@ in # Debugging environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; - environment.systemPackages = lib.utils.removePackagesByName + environment.systemPackages = utils.removePackagesByName (pkgs.mate.basePackages ++ pkgs.mate.extraPackages ++ [ |