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

---
 .../default.nix => by-name/gn/gnome-nettool/package.nix}     | 5 +----
 pkgs/desktops/gnome/default.nix                              | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{desktops/gnome/apps/gnome-nettool/default.nix => by-name/gn/gnome-nettool/package.nix} (93%)

diff --git a/pkgs/desktops/gnome/apps/gnome-nettool/default.nix b/pkgs/by-name/gn/gnome-nettool/package.nix
similarity index 93%
rename from pkgs/desktops/gnome/apps/gnome-nettool/default.nix
rename to pkgs/by-name/gn/gnome-nettool/package.nix
index 54cb937c4bbf..781851e18c89 100644
--- a/pkgs/desktops/gnome/apps/gnome-nettool/default.nix
+++ b/pkgs/by-name/gn/gnome-nettool/package.nix
@@ -73,10 +73,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-nettool";
-      attrPath = "gnome.gnome-nettool";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-nettool"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 20863877d3d4..d9b983e4fbe5 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-nettool = callPackage ./apps/gnome-nettool { };
-
   gnome-notes = callPackage ./apps/gnome-notes { };
 
   gnome-power-manager = callPackage ./apps/gnome-power-manager { };
@@ -193,6 +191,7 @@ in
   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-nettool = lib.warn "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly." pkgs.gnome-nettool; # 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.