From bb4d62ac72a3c8256d46bc02f6b274ce519cfd73 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Aug 2024 18:33:48 +0200
Subject: [PATCH] gnome-weather: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix        | 2 +-
 .../default.nix => by-name/gn/gnome-weather/package.nix}     | 5 +----
 pkgs/desktops/gnome/default.nix                              | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{desktops/gnome/apps/gnome-weather/default.nix => by-name/gn/gnome-weather/package.nix} (92%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 2cab8220b5e4..a41997b2fc5a 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -412,7 +412,7 @@ in
             pkgs.gnome-maps
             pkgs.gnome-music
             pkgs.gnome-system-monitor
-            gnome-weather
+            pkgs.gnome-weather
             pkgs.loupe
             pkgs.nautilus
             pkgs.gnome-connections
diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/by-name/gn/gnome-weather/package.nix
similarity index 92%
rename from pkgs/desktops/gnome/apps/gnome-weather/default.nix
rename to pkgs/by-name/gn/gnome-weather/package.nix
index c849b2db2ca7..d593124ab7ed 100644
--- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix
+++ b/pkgs/by-name/gn/gnome-weather/package.nix
@@ -63,10 +63,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-weather";
-      attrPath = "gnome.gnome-weather";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-weather"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index d8271d979c8f..16ef1a07b115 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -90,8 +90,6 @@ in
 
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
 
-  gnome-weather = callPackage ./apps/gnome-weather { };
-
   polari = callPackage ./apps/polari { };
 
   vinagre = callPackage ./apps/vinagre { };
@@ -196,6 +194,7 @@ in
   gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22.
   gnome-tweaks = lib.warn "The ‘gnome.gnome-tweaks’ was moved to top-level. Please use ‘pkgs.gnome-tweaks’ directly." pkgs.gnome-tweaks; # Added on 2024-06-22.
   gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13.
+  gnome-weather = lib.warn "The ‘gnome.gnome-weather’ was moved to top-level. Please use ‘pkgs.gnome-weather’ directly." pkgs.gnome-weather; # Added on 2024-08-11.
   gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22.
   gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22.
   nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13.