mutter{,43}: Move from gnome scope to top-level

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

@@ -334,10 +334,10 @@ in
         gnome-shell
       ];
 
-      services.udev.packages = with pkgs.gnome; [
+      services.udev.packages = [
         # Force enable KMS modifiers for devices that require them.
-        # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443
-        mutter
+        # https://gitlab.gnome.org/GNOME/pkgs.mutter/-/merge_requests/1443
+        pkgs.mutter
       ];
 
       services.avahi.enable = mkDefault true;

pkgs/applications/misc/phoc/default.nix

@@ -10,7 +10,7 @@
 , wrapGAppsHook3
 , libinput
 , gobject-introspection
-, gnome
+, mutter
 , gnome-desktop
 , glib
 , gtk3
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     gnome-desktop
     # For keybindings settings schemas
-    gnome.mutter
+    mutter
     json-glib
     wayland
     finalAttrs.wlroots

pkgs/by-name/bu/budgie-control-center/package.nix

@@ -48,6 +48,7 @@
   libxslt,
   meson,
   modemmanager,
+  mutter,
   networkmanager,
   networkmanagerapplet,
   ninja,
@@ -122,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-remote-desktop
     gnome-settings-daemon
     gnome-user-share
-    gnome.mutter
+    mutter
     gsettings-desktop-schemas
     gsound
     gtk3
@@ -176,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"
       # WM keyboard shortcuts
-      --prefix XDG_DATA_DIRS : "${gnome.mutter}/share"
+      --prefix XDG_DATA_DIRS : "${mutter}/share"
     )
   '';
 

pkgs/by-name/bu/budgie-desktop/package.nix

@@ -7,7 +7,6 @@
   budgie-screensaver,
   docbook-xsl-nons,
   glib,
-  gnome,
   gnome-desktop,
   gnome-settings-daemon,
   graphene,
@@ -27,6 +26,7 @@
   magpie,
   mesa,
   meson,
+  mutter,
   ninja,
   nix-update-script,
   nixosTests,
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gnome-desktop
     gnome-settings-daemon
-    gnome.mutter
+    mutter
     zenity
     graphene
     gst_all_1.gstreamer

pkgs/by-name/bu/budgie-gsettings-overrides/package.nix

@@ -5,7 +5,7 @@
   budgie-desktop-view,
   glib,
   gsettings-desktop-schemas,
-  gnome,
+  mutter,
   nixos-artwork,
   nixos-background-light ? nixos-artwork.wallpapers.nineish,
   nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray,
@@ -59,7 +59,7 @@ let
     budgie-desktop
     budgie-desktop-view
     gsettings-desktop-schemas
-    gnome.mutter
+    mutter
   ] ++ extraGSettingsOverridePackages;
 
 in

pkgs/by-name/gn/gnome-tweaks/package.nix

@@ -18,6 +18,7 @@
 , libgudev
 , libnotify
 , libxml2
+, mutter
 , pkg-config
 , python3Packages
 , wrapGAppsHook4
@@ -53,7 +54,7 @@ python3Packages.buildPythonApplication rec {
     gnome.gnome-shell
     # Makes it possible to select user themes through the `user-theme` extension
     gnome-shell-extensions
-    gnome.mutter
+    mutter
     gsettings-desktop-schemas
     gtk4
     libadwaita

pkgs/by-name/mu/mutter/package.nix

@@ -200,7 +200,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     updateScript = gnome.updateScript {
       packageName = "mutter";
-      attrPath = "gnome.mutter";
     };
   };
 

pkgs/desktops/gnome/default.nix

@@ -25,11 +25,6 @@ in
 
   gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
-  mutter = callPackage ./core/mutter { };
-
-  # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
-  mutter43 = callPackage ./core/mutter/43 { };
-
   networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
     withGnome = true;
   };
@@ -150,6 +145,8 @@ in
   iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11.
   lightsoff = lib.warn "The ‘gnome.lightsoff’ was moved to top-level. Please use ‘pkgs.lightsoff’ directly." pkgs.lightsoff; # Added on 2024-08-11.
   metacity = lib.warn "The ‘gnome.metacity’ was moved to top-level. Please use ‘pkgs.metacity’ directly." pkgs.metacity; # Added on 2024-08-11.
+  mutter = lib.warn "The ‘gnome.mutter’ was moved to top-level. Please use ‘pkgs.mutter’ directly." pkgs.mutter; # Added on 2024-08-28.
+  mutter43 = lib.warn "The ‘gnome.mutter43’ was moved to top-level. Please use ‘pkgs.mutter43’ directly." pkgs.mutter43; # Added on 2024-08-28.
   nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13.
   nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13.
   polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11.

pkgs/desktops/pantheon/default.nix

@@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   maintainers = lib.teams.pantheon.members;
 
-  mutter = pkgs.gnome.mutter43;
+  mutter = pkgs.mutter43;
 
   # Using 43 to match Mutter used in Pantheon
   gnome-settings-daemon = pkgs.gnome-settings-daemon43;

pkgs/top-level/all-packages.nix

@@ -36544,6 +36544,9 @@ with pkgs;
 
   mate = recurseIntoAttrs (callPackage ../desktops/mate { });
 
+  # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
+  mutter43 = callPackage ../by-name/mu/mutter/43 { };
+
   pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
 
   wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };