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

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

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index e43adf9d8ab8..2bea020d6c95 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -408,7 +408,7 @@ in
             pkgs.gnome-console
             gnome-contacts
             pkgs.gnome-font-viewer
-            gnome-logs
+            pkgs.gnome-logs
             gnome-maps
             gnome-music
             pkgs.gnome-system-monitor
diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/by-name/gn/gnome-logs/package.nix
similarity index 91%
rename from pkgs/desktops/gnome/apps/gnome-logs/default.nix
rename to pkgs/by-name/gn/gnome-logs/package.nix
index b7c897f5b267..3b2723e7fb06 100644
--- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix
+++ b/pkgs/by-name/gn/gnome-logs/package.nix
@@ -59,10 +59,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-logs";
-      attrPath = "gnome.gnome-logs";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-logs"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index f1f12a9f9183..cfbe02144593 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-logs = callPackage ./apps/gnome-logs { };
-
   gnome-maps = callPackage ./apps/gnome-maps { };
 
   gnome-music = callPackage ./apps/gnome-music { };
@@ -196,6 +194,7 @@ in
   gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.
   gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.
   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-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.