From 22b54a6e7fe1c96069c0f73faa78d70be73ca6ef Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 22 Jul 2024 23:56:26 +0800 Subject: [PATCH] cinnamon-gsettings-overrides: Move from cinnamon scope to top-level --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +- .../ci/cinnamon-gsettings-overrides/package.nix} | 0 pkgs/desktops/cinnamon/default.nix | 5 ++--- 3 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{desktops/cinnamon/cinnamon-gsettings-overrides/default.nix => by-name/ci/cinnamon-gsettings-overrides/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 67a7d64080d5..b83580e741eb 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -7,7 +7,7 @@ let cfg = config.services.xserver.desktopManager.cinnamon; serviceCfg = config.services.cinnamon; - nixos-gsettings-overrides = pkgs.cinnamon.cinnamon-gsettings-overrides.override { + nixos-gsettings-overrides = pkgs.cinnamon-gsettings-overrides.override { extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages; extraGSettingsOverrides = cfg.extraGSettingsOverrides; }; diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix similarity index 100% rename from pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix rename to pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 3a40e31b1387..8209f83d43df 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -1,13 +1,12 @@ { config, pkgs, lib }: -lib.makeScope pkgs.newScope (self: with self; { - cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { }; -}) // lib.optionalAttrs config.allowAliases { +lib.makeScope pkgs.newScope (self: { }) // lib.optionalAttrs config.allowAliases { # Aliases need to be outside the scope or they will shadow the attributes from parent scope. bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14 cinnamon-common = lib.warn "cinnamon.cinnamon-common was moved to top-level. Please use pkgs.cinnamon-common directly." pkgs.cinnamon-common; # Added on 2024-07-22 cinnamon-control-center = lib.warn "cinnamon.cinnamon-control-center was moved to top-level. Please use pkgs.cinnamon-control-center directly." pkgs.cinnamon-control-center; # Added on 2024-07-22 cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22 + cinnamon-gsettings-overrides = lib.warn "cinnamon.cinnamon-gsettings-overrides was moved to top-level. Please use pkgs.cinnamon-gsettings-overrides directly." pkgs.cinnamon-gsettings-overrides; # Added on 2024-07-22 cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22 cinnamon-screensaver = lib.warn "cinnamon.cinnamon-screensaver was moved to top-level. Please use pkgs.cinnamon-screensaver directly." pkgs.cinnamon-screensaver; # Added on 2024-07-22 cinnamon-session = lib.warn "cinnamon.cinnamon-session was moved to top-level. Please use pkgs.cinnamon-session directly." pkgs.cinnamon-session; # Added on 2024-07-22