gnome-session: Move from gnome scope to top-level

nixos/modules/config/xdg/portal.nix

@@ -83,7 +83,7 @@ in
     configPackages = mkOption {
       type = types.listOf types.package;
       default = [ ];
-      example = lib.literalExpression "[ pkgs.gnome.gnome-session ]";
+      example = lib.literalExpression "[ pkgs.gnome-session ]";
       description = ''
         List of packages that provide XDG desktop portal configuration, usually in
         the form of `share/xdg-desktop-portal/$desktop-portals.conf`.

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

@@ -123,7 +123,7 @@ in
         description = "List of packages for which gsettings are overridden.";
       };
 
-      debug = mkEnableOption "gnome-session debug messages";
+      debug = mkEnableOption "pkgs.gnome-session debug messages";
 
       flashback = {
         enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity";
@@ -196,7 +196,7 @@ in
       services.gnome.core-shell.enable = true;
       services.gnome.core-utilities.enable = mkDefault true;
 
-      services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ];
+      services.displayManager.sessionPackages = [ pkgs.gnome-session.sessions ];
 
       environment.extraInit = ''
         ${lib.concatMapStrings (p: ''
@@ -249,7 +249,7 @@ in
       ]
       # For /share/applications/${wmName}.desktop
       ++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)
-      # For /share/gnome-session/sessions/gnome-flashback-${wmName}.session
+      # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
       ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);
     })
 
@@ -287,7 +287,7 @@ in
           buildPortalsInGnome = false;
         })
       ];
-      xdg.portal.configPackages = mkDefault [ pkgs.gnome.gnome-session ];
+      xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ];
 
       networking.networkmanager.enable = mkDefault true;
 
@@ -329,8 +329,8 @@ in
       services.gvfs.enable = true;
       services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true));
 
-      systemd.packages = with pkgs.gnome; [
+      systemd.packages = [
-        gnome-session
+        pkgs.gnome-session
         pkgs.gnome-shell
       ];
 

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

@@ -177,7 +177,7 @@ in
         pkgs.pantheon.mutter
       ];
       systemd.packages = with pkgs; [
-        gnome.gnome-session
+        gnome-session
         pantheon.gala
         pantheon.gnome-settings-daemon
         pantheon.elementary-session-settings

nixos/modules/services/x11/display-managers/gdm.nix

@@ -183,7 +183,7 @@ in
     # Otherwise GDM will not be able to start correctly and display Wayland sessions
     systemd.packages = with pkgs.gnome; [
       gdm
-      gnome-session
+      pkgs.gnome-session
       pkgs.gnome-shell
     ];
     environment.systemPackages = [ pkgs.adwaita-icon-theme ];
@@ -236,7 +236,7 @@ in
       EnvironmentFile = "-/etc/locale.conf";
     };
 
-    systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ];
+    systemd.services.display-manager.path = [ pkgs.gnome-session ];
 
     # Allow choosing an user account
     services.accounts-daemon.enable = true;

pkgs/applications/window-managers/phosh/default.nix

@@ -20,6 +20,7 @@
 , gnome
 , gnome-bluetooth
 , gnome-desktop
+, gnome-session
 , gnome-shell
 , gcr
 , pam
@@ -76,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-bluetooth
     gnome.gnome-control-center
     gnome-desktop
-    gnome.gnome-session
+    gnome-session
     gtk4
     pam
     systemd
@@ -112,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}"
-      --set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session"
+      --set GNOME_SESSION "${gnome-session}/bin/gnome-session"
     )
   '';
 

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

@@ -124,7 +124,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-session";
-      attrPath = "gnome.gnome-session";
     };
     providedSessions = [
       "gnome"

pkgs/desktops/gnome/default.nix

@@ -19,8 +19,6 @@ in
 
   gnome-control-center = callPackage ./core/gnome-control-center { };
 
-  gnome-session = callPackage ./core/gnome-session { };
-
   gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
   networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
@@ -121,6 +119,7 @@ in
   gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11.
   gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11.
   gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22.
+  gnome-session = lib.warn "The ‘gnome.gnome-session’ was moved to top-level. Please use ‘pkgs.gnome-session’ directly." pkgs.gnome-session; # Added on 2024-08-28.
   gnome-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28.
   gnome-settings-daemon = lib.warn "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly." pkgs.gnome-settings-daemon; # Added on 2024-08-28.
   gnome-settings-daemon43 = lib.warn "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly." pkgs.gnome-settings-daemon43; # Added on 2024-08-28.

pkgs/desktops/pantheon/default.nix

@@ -95,9 +95,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   elementary-print-shim = callPackage ./desktop/elementary-print-shim { };
 
-  elementary-session-settings = callPackage ./desktop/elementary-session-settings {
+  elementary-session-settings = callPackage ./desktop/elementary-session-settings { };
-    inherit (gnome) gnome-session;
-  };
 
   elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { };
 

pkgs/top-level/all-packages.nix

@@ -36505,7 +36505,7 @@ with pkgs;
 
   gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };
 
-  gnome-session-ctl = callPackage ../desktops/gnome/core/gnome-session/ctl.nix { };
+  gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { };
 
   # Using 43 to match Mutter used in Pantheon
   gnome-settings-daemon43 = callPackage ../by-name/gn/gnome-settings-daemon/43 { };