cinnamon: Renamed from cinnamon-common

This is the upstream project name.

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

@@ -66,7 +66,7 @@ in
 
   config = mkMerge [
     (mkIf cfg.enable {
-      services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];
+      services.displayManager.sessionPackages = [ pkgs.cinnamon ];
 
       services.xserver.displayManager.lightdm.greeters.slick = {
         enable = mkDefault true;
@@ -114,7 +114,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-common
+        cinnamon
         cinnamon-screensaver
         nemo-with-extensions
         xapp
@@ -166,7 +166,7 @@ in
             desktop-file-utils
 
             # common-files
-            cinnamon-common
+            cinnamon
             cinnamon-session
             cinnamon-desktop
             cinnamon-menus
@@ -177,7 +177,7 @@ in
 
             # session requirements
             cinnamon-screensaver
-            # cinnamon-killer-daemon: provided by cinnamon-common
+            # cinnamon-killer-daemon: provided by cinnamon
             networkmanagerapplet # session requirement - also nm-applet not needed
 
             # packages
@@ -225,7 +225,7 @@ in
 
       services.orca.enable = mkDefault (notExcluded pkgs.orca);
 
-      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];
+      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

pkgs/by-name/ar/arc-theme/package.nix

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

pkgs/by-name/ci/cinnamon-desktop/package.nix

@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file
     patchShebangs install-scripts/meson_install_schemas.py
-    sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon
+    sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon/share/cinnamon
   '';
 
   meta = with lib; {

pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix

@@ -15,7 +15,7 @@
   cinnamon-desktop,
   cinnamon-session,
   cinnamon-settings-daemon,
-  cinnamon-common,
+  cinnamon,
   bulky,
 }:
 
@@ -35,7 +35,7 @@ let
     cinnamon-desktop
     cinnamon-session
     cinnamon-settings-daemon
-    cinnamon-common
+    cinnamon
     gnome-terminal
     gsettings-desktop-schemas
     gtk3

pkgs/by-name/ci/cinnamon-screensaver/package.nix

@@ -9,7 +9,7 @@
   dbus,
   gettext,
   cinnamon-desktop,
-  cinnamon-common,
+  cinnamon,
   intltool,
   libxslt,
   gtk3,
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     pam
     cairo
     cinnamon-desktop
-    cinnamon-common
+    cinnamon
     libgnomekbd
     caribou
   ];

pkgs/by-name/ci/cinnamon/package.nix

@@ -73,9 +73,8 @@ let
     ]
   );
 in
-# TODO (after 25.05 branch-off): Rename to pkgs.cinnamon
 stdenv.mkDerivation rec {
-  pname = "cinnamon-common";
+  pname = "cinnamon";
   version = "6.4.10";
 
   src = fetchFromGitHub {

pkgs/top-level/aliases.nix

@@ -443,7 +443,7 @@ mapAliases {
   CHOWTapeModel = chow-tape-model; # Added 2024-06-12
   chromatic = throw "chromatic has been removed due to being unmaintained and failing to build"; # Added 2025-04-18
   chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
-  cinnamon = throw "The cinnamon scope has been removed and all packages have been moved to the top-level"; # Added 2024-11-25
+  cinnamon-common = cinnamon; # Added 2025-08-06
   citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
   citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
   citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04