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

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

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index e30ee1257148..1c56a2515abe 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -461,7 +461,7 @@ in
         pkgs.four-in-a-row
         pkgs.gnome-2048
         pkgs.gnome-chess
-        gnome-klotski
+        pkgs.gnome-klotski
         gnome-mahjongg
         gnome-mines
         gnome-nibbles
diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/by-name/gn/gnome-klotski/package.nix
similarity index 91%
rename from pkgs/desktops/gnome/games/gnome-klotski/default.nix
rename to pkgs/by-name/gn/gnome-klotski/package.nix
index 80b5fdc1b224..11680d5466b2 100644
--- a/pkgs/desktops/gnome/games/gnome-klotski/default.nix
+++ b/pkgs/by-name/gn/gnome-klotski/package.nix
@@ -60,10 +60,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-klotski";
-      attrPath = "gnome.gnome-klotski";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-klotski"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index a53b64279b97..b0179b1a4a1b 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -80,8 +80,6 @@ in
 
 #### Games
 
-  gnome-klotski = callPackage ./games/gnome-klotski { };
-
   gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
 
   gnome-mines = callPackage ./games/gnome-mines { };
@@ -162,6 +160,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-klotski = lib.warn "The ‘gnome.gnome-klotski’ was moved to top-level. Please use ‘pkgs.gnome-klotski’ directly." pkgs.gnome-klotski; # Added on 2024-08-11.
   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.