Merge pull request #329199 from bobby285271/upd/cinnamon-by-name

Move all packages out of cinnamon scope

.github/CODEOWNERS

@@ -305,7 +305,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/build-support/make-hardcode-gsettings-patch @jtojnar
 
 # Cinnamon
-/pkgs/desktops/cinnamon @mkg20001
+/pkgs/by-name/ci/cinnamon-*    @mkg20001
+/pkgs/by-name/cj/cjs           @mkg20001
+/pkgs/by-name/mu/muffin        @mkg20001
+/pkgs/by-name/ne/nemo          @mkg20001
+/pkgs/by-name/ne/nemo-*        @mkg20001
 
 # nim
 /pkgs/development/compilers/nim   @ehmry

.github/labeler.yml

@@ -12,9 +12,14 @@
   - any:
     - changed-files:
       - any-glob-to-any-file:
-        - pkgs/desktops/cinnamon/**/*
         - nixos/modules/services/x11/desktop-managers/cinnamon.nix
         - nixos/tests/cinnamon.nix
+        - nixos/tests/cinnamon-wayland.nix
+        - pkgs/by-name/ci/cinnamon-*/**/*
+        - pkgs/by-name/cj/cjs/**/*
+        - pkgs/by-name/mu/muffin/**/*
+        - pkgs/by-name/ne/nemo/**/*
+        - pkgs/by-name/ne/nemo-*/**/*
 
 "6.topic: dotnet":
   - any:

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -109,6 +109,8 @@
   moved into the top level scope (i.e., `budgie.budgie-desktop` is now
   `budgie-desktop`)
 
+- All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`).
+
 - `services.cgit` now runs as the cgit user by default instead of root.
   This change requires granting access to the repositories to this user or
   setting the appropriate one through `services.cgit.some-instance.user`.

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

@@ -142,7 +142,7 @@ in {
       ]
       ++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
       ++ (utils.removePackagesByName [
-          cinnamon.nemo
+          nemo
           mate.eom
           mate.pluma
           mate.atril

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;
   };
@@ -51,7 +51,7 @@ in
 
     environment.cinnamon.excludePackages = mkOption {
       default = [];
-      example = literalExpression "[ pkgs.cinnamon.blueberry ]";
+      example = literalExpression "[ pkgs.blueman ]";
       type = types.listOf types.package;
       description = "Which packages cinnamon should exclude from the default environment";
     };
@@ -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,9 +102,9 @@ 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.cinnamon-screensaver
-        cinnamon.nemo-with-extensions
+        cinnamon-common
+        cinnamon-screensaver
+        nemo-with-extensions
         xapp
       ];
       services.cinnamon.apps.enable = mkDefault true;
@@ -138,17 +138,17 @@ in
         desktop-file-utils
 
         # common-files
-        cinnamon.cinnamon-common
-        cinnamon.cinnamon-session
-        cinnamon.cinnamon-desktop
-        cinnamon.cinnamon-menus
-        cinnamon.cinnamon-translations
+        cinnamon-common
+        cinnamon-session
+        cinnamon-desktop
+        cinnamon-menus
+        cinnamon-translations
 
         # utils needed by some scripts
         killall
 
         # session requirements
-        cinnamon.cinnamon-screensaver
+        cinnamon-screensaver
         # cinnamon-killer-daemon: provided by cinnamon-common
         networkmanagerapplet # session requirement - also nm-applet not needed
 
@@ -156,10 +156,10 @@ in
         polkit_gnome
 
         # packages
-        cinnamon.nemo-with-extensions
+        nemo-with-extensions
         gnome-online-accounts-gtk
-        cinnamon.cinnamon-control-center
-        cinnamon.cinnamon-settings-daemon
+        cinnamon-control-center
+        cinnamon-settings-daemon
         libgnomekbd
 
         # theme
@@ -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/by-name/ne/nemo-fileroller/package.nix

@@ -11,12 +11,16 @@
 , cinnamon-translations
 }:
 
-let
-  srcs = import ../srcs.nix { inherit fetchFromGitHub; };
-in
 stdenv.mkDerivation rec {
   pname = "nemo-fileroller";
-  inherit (srcs) version src;
+  version = "6.2.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = "nemo-extensions";
+    rev = version;
+    sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA=";
+  };
 
   sourceRoot = "${src.name}/nemo-fileroller";
 

pkgs/by-name/ne/nemo-python/package.nix

@@ -10,12 +10,16 @@
 , python3
 }:
 
-let
-  srcs = import ../srcs.nix { inherit fetchFromGitHub; };
-in
 stdenv.mkDerivation rec {
   pname = "nemo-python";
-  inherit (srcs) version src;
+  version = "6.2.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = "nemo-extensions";
+    rev = version;
+    sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA=";
+  };
 
   sourceRoot = "${src.name}/nemo-python";
 

pkgs/by-name/ne/nemo-with-extensions/package.nix

@@ -51,5 +51,5 @@ symlinkJoin {
     done
   '';
 
-  inherit (nemo) meta;
+  meta = builtins.removeAttrs nemo.meta [ "name" "outputsToInstall" "position" ];
 }

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/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,25 +1,23 @@
 { config, pkgs, lib }:
 
-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 { };
-  cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
-  cinnamon-session = callPackage ./cinnamon-session { };
-  cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
-  cjs = callPackage ./cjs { };
-  nemo = callPackage ./nemo { };
-  nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { };
-  nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { };
-  nemo-python = callPackage ./nemo-extensions/nemo-python { };
-  nemo-with-extensions = callPackage ./nemo/wrapper.nix { };
-  muffin = callPackage ./muffin { };
-}) // lib.optionalAttrs config.allowAliases {
+# The cinnamon scope is deprecated and no package additions should be done here.
+#
+# TODO (after 24.11 branch-off): Remove this scope entirely.
+# TODO (after 25.05 branch-off): Rename pkgs.cinnamon-common to pkgs.cinnamon.
+
+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
+  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
   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
@@ -30,7 +28,13 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-themes = lib.warn "cinnamon.mint-themes was moved to top-level. Please use pkgs.mint-themes directly." pkgs.mint-themes; # Added on 2024-07-14
   mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # Added on 2024-07-14
   mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
-  nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
+  muffin = lib.warn "cinnamon.muffin was moved to top-level. Please use pkgs.muffin directly." pkgs.muffin; # Added on 2024-07-22
+  nemo = lib.warn "cinnamon.nemo was moved to top-level. Please use pkgs.nemo directly." pkgs.nemo; # Added on 2024-07-22
+  nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22
+  nemo-fileroller = lib.warn "cinnamon.nemo-fileroller was moved to top-level. Please use pkgs.nemo-fileroller directly." pkgs.nemo-fileroller; # Added on 2024-07-22
+  nemo-python = lib.warn "cinnamon.nemo-python was moved to top-level. Please use pkgs.nemo-python directly." pkgs.nemo-python; # Added on 2024-07-22
+  nemo-with-extensions = lib.warn "cinnamon.nemo-with-extensions was moved to top-level. Please use pkgs.nemo-with-extensions directly." pkgs.nemo-with-extensions; # Added on 2024-07-22
+  nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override pkgs.nemo-with-extensions."; # Added on 2024-07-14
   pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
   warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14
   xapp = lib.warn "cinnamon.xapp was moved to top-level. Please use pkgs.xapp directly." pkgs.xapp; # Added on 2024-07-14

pkgs/desktops/cinnamon/nemo-extensions/srcs.nix

@@ -1,15 +0,0 @@
-{ fetchFromGitHub }:
-
-rec {
-  # When you bump this, you should make sure all nemo-extensions
-  # are actually using this file since we try to deal with tags
-  # like nemo-fileroller-5.6.1 according to upstream's wishes.
-  version = "6.2.0";
-
-  src = fetchFromGitHub {
-    owner = "linuxmint";
-    repo = "nemo-extensions";
-    rev = version;
-    sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA=";
-  };
-}

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