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

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

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 5375fe0eda8e..b94231d32546 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -467,7 +467,7 @@ in
         pkgs.gnome-nibbles
         pkgs.gnome-robots
         pkgs.gnome-sudoku
-        gnome-taquin
+        pkgs.gnome-taquin
         gnome-tetravex
         hitori
         iagno
diff --git a/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/pkgs/by-name/gn/gnome-taquin/package.nix
similarity index 92%
rename from pkgs/desktops/gnome/games/gnome-taquin/default.nix
rename to pkgs/by-name/gn/gnome-taquin/package.nix
index 9702a0358eb1..e570d9148b45 100644
--- a/pkgs/desktops/gnome/games/gnome-taquin/default.nix
+++ b/pkgs/by-name/gn/gnome-taquin/package.nix
@@ -62,10 +62,7 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-taquin";
-      attrPath = "gnome.gnome-taquin";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-taquin"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index d27834cc2183..43834f2e4976 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -80,8 +80,6 @@ in
 
 #### Games
 
-  gnome-taquin = callPackage ./games/gnome-taquin { };
-
   gnome-tetravex = callPackage ./games/gnome-tetravex { };
 
   hitori = callPackage ./games/hitori { };
@@ -168,6 +166,7 @@ in
   gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11.
   gnome-sudoku = lib.warn "The ‘gnome.gnome-sudoku’ was moved to top-level. Please use ‘pkgs.gnome-sudoku’ directly." pkgs.gnome-sudoku; # Added on 2024-08-11.
   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.
+  gnome-taquin = lib.warn "The ‘gnome.gnome-taquin’ was moved to top-level. Please use ‘pkgs.gnome-taquin’ directly." pkgs.gnome-taquin; # Added on 2024-08-11.
   gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13.
   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.