diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index cc687648fded..be64c89b1a50 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -159,7 +159,7 @@ in cinnamon.nemo-with-extensions gnome-online-accounts-gtk cinnamon.cinnamon-control-center - cinnamon.cinnamon-settings-daemon + cinnamon-settings-daemon libgnomekbd # theme diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch b/pkgs/by-name/ci/cinnamon-settings-daemon/csd-backlight-helper-fix.patch similarity index 100% rename from pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch rename to pkgs/by-name/ci/cinnamon-settings-daemon/csd-backlight-helper-fix.patch diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix similarity index 100% rename from pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix rename to pkgs/by-name/ci/cinnamon-settings-daemon/package.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 6d652c11a421..ffab563f7f5b 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { }; cinnamon-screensaver = callPackage ./cinnamon-screensaver { }; cinnamon-session = callPackage ./cinnamon-session { }; - cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { }; nemo = callPackage ./nemo { }; nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { }; nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { }; @@ -18,6 +17,7 @@ lib.makeScope pkgs.newScope (self: with self; { bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14 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-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-settings-daemon = lib.warn "cinnamon.cinnamon-settings-daemon was moved to top-level. Please use pkgs.cinnamon-settings-daemon directly." pkgs.cinnamon-settings-daemon; # Added on 2024-07-22 cinnamon-translations = lib.warn "cinnamon.cinnamon-translations was moved to top-level. Please use pkgs.cinnamon-translations directly." pkgs.cinnamon-translations; # Added on 2024-07-22 cjs = lib.warn "cinnamon.cjs was moved to top-level. Please use pkgs.cjs directly." pkgs.cjs; # Added on 2024-07-22 iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14