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

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

@@ -60,7 +60,7 @@ in
 
   config = mkMerge [
     (mkIf cfg.enable {
-      services.displayManager.sessionPackages = [ pkgs.cinnamon.cinnamon-common ];
+      services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];
 
       services.xserver.displayManager.lightdm.greeters.slick = {
         enable = mkDefault true;
@@ -102,7 +102,7 @@ in
       services.accounts-daemon.enable = true;
       services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.dbus.packages = with pkgs; [
-        cinnamon.cinnamon-common
+        cinnamon-common
         cinnamon.cinnamon-screensaver
         nemo-with-extensions
         xapp
@@ -138,7 +138,7 @@ in
         desktop-file-utils
 
         # common-files
-        cinnamon.cinnamon-common
+        cinnamon-common
         cinnamon-session
         cinnamon-desktop
         cinnamon-menus
@@ -200,7 +200,7 @@ in
         })
       ];
 
-      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon.cinnamon-common ];
+      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

pkgs/data/themes/arc/default.nix

@@ -8,7 +8,7 @@
 , gnome-themes-extra
 , gtk-engine-murrine
 , inkscape
-, cinnamon
+, cinnamon-common
 , makeFontsConf
 , python3
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
     # "-Dvariants=light,darker,dark,lighter"
-    "-Dcinnamon_version=${cinnamon.cinnamon-common.version}"
+    "-Dcinnamon_version=${cinnamon-common.version}"
     "-Dgnome_shell_version=${gnome.gnome-shell.version}"
     # You will need to patch gdm to make use of this.
     "-Dgnome_shell_gresource=true"

pkgs/desktops/cinnamon/default.nix

@@ -1,12 +1,12 @@
 { config, pkgs, lib }:
 
 lib.makeScope pkgs.newScope (self: with self; {
-  cinnamon-common = callPackage ./cinnamon-common { };
   cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
   cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
 }) // 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-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