From e526fd2b1a40e4ca0b5e07e87b8c960281c67412 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Thu, 12 Dec 2024 21:58:33 +0100
Subject: [PATCH] gnome-shell: fix extensions' default (#6199)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Else I get a
===

       … while calling the 'throw' builtin
         at /nix/store/afpmddfrmx5df3h16bdh00yy8i7db8w4-source/pkgs/desktops/gnome/default.nix:96:28:
           95|   gnome-shell = throw "The ‘gnome.gnome-shell’ was moved to top-level. Please use ‘pkgs.gnome-shell’ directly."; # Added on 2024-08-28.
           96|   gnome-shell-extensions = throw "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly."; # Added on 2024-08-11.
             |                            ^
           97|   gnome-software = throw "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly."; # Added on 2024-08-11.

       error: The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly.
===

on rebuild
---
 modules/programs/gnome-shell.nix                   | 6 +++---
 tests/modules/programs/gnome-shell/gnome-shell.nix | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/programs/gnome-shell.nix b/modules/programs/gnome-shell.nix
index 36a57cea9..a91609bf2 100644
--- a/modules/programs/gnome-shell.nix
+++ b/modules/programs/gnome-shell.nix
@@ -17,7 +17,7 @@ let
 
       package = mkOption {
         type = types.package;
-        example = "pkgs.gnome.gnome-shell-extensions";
+        example = "pkgs.gnome-shell-extensions";
         description = ''
           Package providing a GNOME Shell extension in
           `$out/share/gnome-shell/extensions/''${id}`.
@@ -66,7 +66,7 @@ in {
           { package = pkgs.gnomeExtensions.dash-to-panel; }
           {
             id = "user-theme@gnome-shell-extensions.gcampax.github.com";
-            package = pkgs.gnome.gnome-shell-extensions;
+            package = pkgs.gnome-shell-extensions;
           }
         ]
       '';
@@ -106,7 +106,7 @@ in {
 
       programs.gnome-shell.extensions = [{
         id = "user-theme@gnome-shell-extensions.gcampax.github.com";
-        package = pkgs.gnome.gnome-shell-extensions;
+        package = pkgs.gnome-shell-extensions;
       }];
 
       home.packages = [ cfg.theme.package ];
diff --git a/tests/modules/programs/gnome-shell/gnome-shell.nix b/tests/modules/programs/gnome-shell/gnome-shell.nix
index 02f44e0c3..6c3eb6bca 100644
--- a/tests/modules/programs/gnome-shell/gnome-shell.nix
+++ b/tests/modules/programs/gnome-shell/gnome-shell.nix
@@ -36,11 +36,7 @@ let
 
 in {
   nixpkgs.overlays = [
-    (self: super: {
-      gnome = super.gnome.overrideScope (gself: gsuper: {
-        gnome-shell-extensions = dummy-gnome-shell-extensions;
-      });
-    })
+    (final: prev: { gnome-shell-extensions = dummy-gnome-shell-extensions; })
   ];
 
   programs.gnome-shell.enable = true;