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

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

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 423f3bfe9f07..a9f9ca8f09e0 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -456,7 +456,7 @@ in
     (lib.mkIf serviceCfg.games.enable {
       environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [
         pkgs.aisleriot
-        atomix
+        pkgs.atomix
         five-or-more
         four-in-a-row
         pkgs.gnome-2048
diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/by-name/at/atomix/package.nix
similarity index 90%
rename from pkgs/desktops/gnome/games/atomix/default.nix
rename to pkgs/by-name/at/atomix/package.nix
index 2b6a5e72a708..341e97d0c9ab 100644
--- a/pkgs/desktops/gnome/games/atomix/default.nix
+++ b/pkgs/by-name/at/atomix/package.nix
@@ -46,10 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "atomix";
-      attrPath = "gnome.atomix";
-    };
+    updateScript = gnome.updateScript { packageName = "atomix"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index d6f9df10ef8d..b11f5ce2a00f 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -80,8 +80,6 @@ in
 
 #### Games
 
-  atomix = callPackage ./games/atomix { };
-
   five-or-more = callPackage ./games/five-or-more { };
 
   four-in-a-row = callPackage ./games/four-in-a-row { };
@@ -140,6 +138,7 @@ in
   accerciser = lib.warn "The ‘gnome.accerciser’ was moved to top-level. Please use ‘pkgs.accerciser’ directly." pkgs.accerciser; # Added on 2024-06-22.
   adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22.
   aisleriot = lib.warn "The ‘gnome.aisleriot’ was moved to top-level. Please use ‘pkgs.aisleriot’ directly." pkgs.aisleriot; # Added on 2024-08-11.
+  atomix = lib.warn "The ‘gnome.atomix’ was moved to top-level. Please use ‘pkgs.atomix’ directly." pkgs.atomix; # Added on 2024-08-11.
   baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22.
   cheese = lib.warn "The ‘gnome.cheese’ was moved to top-level. Please use ‘pkgs.cheese’ directly." pkgs.cheese; # Added on 2024-06-22.
   dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22.