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

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

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 88b34a1ba571..2cab8220b5e4 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -410,7 +410,7 @@ in
             pkgs.gnome-font-viewer
             pkgs.gnome-logs
             pkgs.gnome-maps
-            gnome-music
+            pkgs.gnome-music
             pkgs.gnome-system-monitor
             gnome-weather
             pkgs.loupe
diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/by-name/gn/gnome-music/package.nix
similarity index 94%
rename from pkgs/desktops/gnome/apps/gnome-music/default.nix
rename to pkgs/by-name/gn/gnome-music/package.nix
index 7e29c199bef3..4452a9cc8ada 100644
--- a/pkgs/desktops/gnome/apps/gnome-music/default.nix
+++ b/pkgs/by-name/gn/gnome-music/package.nix
@@ -98,10 +98,7 @@ python3.pkgs.buildPythonApplication rec {
   strictDeps = false;
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-music";
-      attrPath = "gnome.gnome-music";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-music"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 42952c21efa5..20863877d3d4 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-music = callPackage ./apps/gnome-music { };
-
   gnome-nettool = callPackage ./apps/gnome-nettool { };
 
   gnome-notes = callPackage ./apps/gnome-notes { };
@@ -194,6 +192,7 @@ in
   gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22.
   gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11.
   gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11.
+  gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11.
   gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22.
   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-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22.