nixos/pantheon: Don't enable modules for excludePackages

ref: bc970e94e786d554237c931457ac50f5c415b9f0
ref: nixpkgs issue 299877

While at it, also enable flatpak in nixosTests.pantheon so we ensure appcenter builds.

Changed files
+10 -2
nixos
modules
services
x11
desktop-managers
tests
+3 -2
nixos/modules/services/x11/desktop-managers/pantheon.nix
···
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
};
+
notExcluded = pkg: (!(lib.elem pkg config.environment.pantheon.excludePackages));
in
{
···
})
(mkIf serviceCfg.apps.enable {
-
programs.evince.enable = mkDefault true;
-
programs.file-roller.enable = mkDefault true;
+
programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince);
+
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
environment.systemPackages = utils.removePackagesByName ([
pkgs.gnome.gnome-font-viewer
+7
nixos/tests/pantheon.nix
···
services.xserver.enable = true;
services.xserver.desktopManager.pantheon.enable = true;
+
# We ship pantheon.appcenter by default when this is enabled.
+
services.flatpak.enable = true;
+
+
# We don't ship gnome-text-editor in Pantheon module, we add this line mainly
+
# to catch eval issues related to this option.
+
environment.pantheon.excludePackages = [ pkgs.gnome-text-editor ];
+
environment.systemPackages = [ pkgs.xdotool ];
};