cinnamon-desktop: Move from cinnamon scope to top-level

nixos/modules/services/x11/desktop-managers/cinnamon.nix

@@ -140,7 +140,7 @@ in
         # common-files
         cinnamon.cinnamon-common
         cinnamon.cinnamon-session
-        cinnamon.cinnamon-desktop
+        cinnamon-desktop
         cinnamon.cinnamon-menus
         cinnamon.cinnamon-translations
 

pkgs/by-name/xv/xviewer/package.nix

@@ -20,7 +20,7 @@
 , pkg-config
 , python3
 , wrapGAppsHook3
-, cinnamon
+, cinnamon-desktop
 , yelp-tools
 , xapp
 }:
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    cinnamon.cinnamon-desktop
+    cinnamon-desktop
     exempi
     gdk-pixbuf
     glib

pkgs/desktops/cinnamon/default.nix

@@ -3,7 +3,6 @@
 lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-common = callPackage ./cinnamon-common { };
   cinnamon-control-center = callPackage ./cinnamon-control-center { };
-  cinnamon-desktop = callPackage ./cinnamon-desktop { };
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-menus = callPackage ./cinnamon-menus { };
   cinnamon-translations = callPackage ./cinnamon-translations { };
@@ -20,6 +19,7 @@ lib.makeScope pkgs.newScope (self: with 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-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
   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
   iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # Added on 2024-07-14
   folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14

pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix

@@ -5,7 +5,7 @@
 , ninja
 , pkg-config
 , wrapGAppsHook3
-, cinnamon
+, cinnamon-desktop
 , glib
 , gsettings-desktop-schemas
 , gtk3
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    cinnamon.cinnamon-desktop # org.cinnamon.desktop.background
+    cinnamon-desktop # org.cinnamon.desktop.background
     glib
     gsettings-desktop-schemas # org.gnome.system.location
     gtk3