From c87380f3742fdc07ee293c7a8ffe4991148dc08e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 12 Oct 2025 12:07:07 -0300
Subject: [PATCH] armagetronad, armagetronad-dedicated: move to by-name,
 modernize

---
 pkgs/by-name/ar/armagetronad-dedicated/package.nix        | 7 +++++++
 .../default.nix => by-name/ar/armagetronad/package.nix}   | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ----
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/by-name/ar/armagetronad-dedicated/package.nix
 rename pkgs/{games/armagetronad/default.nix => by-name/ar/armagetronad/package.nix} (98%)

diff --git a/pkgs/by-name/ar/armagetronad-dedicated/package.nix b/pkgs/by-name/ar/armagetronad-dedicated/package.nix
new file mode 100644
index 000000000000..67aa20cb7210
--- /dev/null
+++ b/pkgs/by-name/ar/armagetronad-dedicated/package.nix
@@ -0,0 +1,7 @@
+{
+  armagetronad,
+}:
+
+armagetronad.override {
+  dedicatedServer = true;
+}
diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/by-name/ar/armagetronad/package.nix
similarity index 98%
rename from pkgs/games/armagetronad/default.nix
rename to pkgs/by-name/ar/armagetronad/package.nix
index c42be9aed44c..f814aad03c33 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/by-name/ar/armagetronad/package.nix
@@ -248,13 +248,13 @@ let
             tests.armagetronad = nixosTests.armagetronad;
           };
 
-      meta = with lib; {
+      meta = {
         inherit mainProgram;
         homepage = "https://www.armagetronad.org";
         description = "Multiplayer networked arcade racing game in 3D similar to Tron";
-        maintainers = with maintainers; [ numinit ];
-        license = licenses.gpl2Plus;
-        platforms = platforms.linux;
+        maintainers = with lib.maintainers; [ numinit ];
+        license = lib.licenses.gpl2Plus;
+        platforms = lib.platforms.linux;
       };
     };
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aae412a71ab2..6e9801e7421c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13288,10 +13288,6 @@ with pkgs;
   anki-bin = callPackage ../games/anki/bin.nix { };
   anki-sync-server = callPackage ../games/anki/sync-server.nix { };
 
-  armagetronad = callPackage ../games/armagetronad { };
-
-  armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; };
-
   art = callPackage ../by-name/ar/art/package.nix {
     fftw = fftwSinglePrec;
   };