From b37f158fb00eb0a43dc2a7bc205919fdac4df3fa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 31 Aug 2024 11:00:49 +0200
Subject: [PATCH] gnome-applets: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix         | 4 ++--
 .../default.nix => by-name/gn/gnome-applets/package.nix}      | 1 -
 pkgs/desktops/gnome/default.nix                               | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/gnome/misc/gnome-applets/default.nix => by-name/gn/gnome-applets/package.nix} (97%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 48f11b779534..283cfe1726d7 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -162,8 +162,8 @@ in
         };
 
         panelModulePackages = mkOption {
-          default = [ pkgs.gnome.gnome-applets ];
-          defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]";
+          default = [ pkgs.gnome-applets ];
+          defaultText = literalExpression "[ pkgs.gnome-applets ]";
           type = types.listOf types.package;
           description = ''
             Packages containing modules that should be made available to `pkgs.gnome-panel` (usually for applets).
diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/by-name/gn/gnome-applets/package.nix
similarity index 97%
rename from pkgs/desktops/gnome/misc/gnome-applets/default.nix
rename to pkgs/by-name/gn/gnome-applets/package.nix
index 179e9a0d6d74..65edba55cb08 100644
--- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix
+++ b/pkgs/by-name/gn/gnome-applets/package.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-applets";
-      attrPath = "gnome.gnome-applets";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index fe540be7325e..f9ebf1a074d9 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -47,8 +47,6 @@ in
 
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
-  gnome-applets = callPackage ./misc/gnome-applets { };
-
   gnome-flashback = callPackage ./misc/gnome-flashback { };
 
 }) // lib.optionalAttrs config.allowAliases {
@@ -81,6 +79,7 @@ in
   geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22.
   ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22.
   gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.
+  gnome-applets = lib.warn "The ‘gnome.gnome-applets’ was moved to top-level. Please use ‘pkgs.gnome-applets’ directly." pkgs.gnome-applets; # Added on 2024-08-31.
   gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13.
   gnome-backgrounds = lib.warn "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly." pkgs.gnome-backgrounds; # Added on 2024-08-11.
   gnome-bluetooth = lib.warn "The ‘gnome.gnome-bluetooth’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth’ directly." pkgs.gnome-bluetooth; # Added on 2024-08-28.