From 8435c2e684435148db19937640f66e36174f5f94 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:50:58 -0700
Subject: [PATCH 01/22] linthesia: modernize, move to by-name/

---
 .../li/linthesia/package.nix}                      | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{games/linthesia/default.nix => by-name/li/linthesia/package.nix} (78%)

diff --git a/pkgs/games/linthesia/default.nix b/pkgs/by-name/li/linthesia/package.nix
similarity index 78%
rename from pkgs/games/linthesia/default.nix
rename to pkgs/by-name/li/linthesia/package.nix
index a214c80b7792..013366e8ff40 100644
--- a/pkgs/games/linthesia/default.nix
+++ b/pkgs/by-name/li/linthesia/package.nix
@@ -18,7 +18,7 @@
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "linthesia";
   version = "unstable-2023-05-23";
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     owner = "linthesia";
     repo = "linthesia";
     rev = "1f2701241f8865c2f5c14a97b81ae64884cf0396";
-    sha256 = "sha256-3uPcpDUGtAGW9q/u8Cn+0bNqikII1Y/a0PKARW/5nao=";
+    hash = "sha256-3uPcpDUGtAGW9q/u8Cn+0bNqikII1Y/a0PKARW/5nao=";
   };
 
   postPatch = ''
@@ -52,12 +52,12 @@ stdenv.mkDerivation rec {
     gtk3.out # icon cache
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Game of playing music using a MIDI keyboard following a MIDI file";
     mainProgram = "linthesia";
-    inherit (src.meta) homepage;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    inherit (finalAttrs.src.meta) homepage;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e163d061a653..f085454caa53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10012,8 +10012,6 @@ with pkgs;
   libkrun-sev = libkrun.override { variant = "sev"; };
   libkrun-tdx = libkrun.override { variant = "tdx"; };
 
-  linthesia = callPackage ../games/linthesia/default.nix { };
-
   projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { };
 
   lklWithFirewall = lkl.override { firewallSupport = true; };

From 40fe2a0d664704d0887333f7f37169d15a97ef6c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:53:12 -0700
Subject: [PATCH 02/22] iortcw: move to by-name/

---
 .../iortcw/default.nix => by-name/io/iortcw/package.nix}       | 0
 pkgs/{games => by-name/io}/iortcw/sp.nix                       | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{games/iortcw/default.nix => by-name/io/iortcw/package.nix} (100%)
 rename pkgs/{games => by-name/io}/iortcw/sp.nix (100%)

diff --git a/pkgs/games/iortcw/default.nix b/pkgs/by-name/io/iortcw/package.nix
similarity index 100%
rename from pkgs/games/iortcw/default.nix
rename to pkgs/by-name/io/iortcw/package.nix
diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/by-name/io/iortcw/sp.nix
similarity index 100%
rename from pkgs/games/iortcw/sp.nix
rename to pkgs/by-name/io/iortcw/sp.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f085454caa53..c47c76a19619 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13203,9 +13203,8 @@ with pkgs;
 
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
-  iortcw = callPackage ../games/iortcw { };
   # used as base package for iortcw forks
-  iortcw_sp = callPackage ../games/iortcw/sp.nix { };
+  iortcw_sp = callPackage ../by-name/io/iortcw/sp.nix { };
 
   katagoWithCuda = katago.override {
     backend = "cuda";

From 247bdeb02ff375f9ba4cc4b37f873446ad9e0d94 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:55:43 -0700
Subject: [PATCH 03/22] quakespasm: modernize, move to by-name/

---
 .../qu/quakespasm/package.nix}                   | 16 ++++++++--------
 ...quakespasm-darwin-makefile-improvements.patch |  0
 pkgs/{games => by-name/qu}/quakespasm/vulkan.nix |  0
 pkgs/top-level/all-packages.nix                  |  3 +--
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename pkgs/{games/quakespasm/default.nix => by-name/qu/quakespasm/package.nix} (90%)
 rename pkgs/{games => by-name/qu}/quakespasm/quakespasm-darwin-makefile-improvements.patch (100%)
 rename pkgs/{games => by-name/qu}/quakespasm/vulkan.nix (100%)

diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/by-name/qu/quakespasm/package.nix
similarity index 90%
rename from pkgs/games/quakespasm/default.nix
rename to pkgs/by-name/qu/quakespasm/package.nix
index 8b669b489773..d76476cce0e1 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/by-name/qu/quakespasm/package.nix
@@ -20,16 +20,16 @@
   useSDL2 ? stdenv.hostPlatform.isDarwin, # TODO: CoreAudio fails to initialize with SDL 1.x for some reason.
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "quakespasm";
   version = "0.96.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz";
-    sha256 = "sha256-tXjWzkpPf04mokRY8YxLzI04VK5iUuuZgu6B2V5QGA4=";
+    url = "mirror://sourceforge/quakespasm/quakespasm-${finalAttrs.version}.tar.gz";
+    hash = "sha256-tXjWzkpPf04mokRY8YxLzI04VK5iUuuZgu6B2V5QGA4=";
   };
 
-  sourceRoot = "${pname}-${version}/Quake";
+  sourceRoot = "quakespasm-${finalAttrs.version}/Quake";
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
     # Makes Darwin Makefile use system libraries instead of ones from app bundle
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Engine for iD software's Quake";
     homepage = "https://quakespasm.sourceforge.net/";
     longDescription = ''
@@ -125,8 +125,8 @@ stdenv.mkDerivation rec {
       and smoother mouse input - though no CD support.
     '';
 
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ mikroskeem ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ mikroskeem ];
     mainProgram = "quake";
   };
-}
+})
diff --git a/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch b/pkgs/by-name/qu/quakespasm/quakespasm-darwin-makefile-improvements.patch
similarity index 100%
rename from pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch
rename to pkgs/by-name/qu/quakespasm/quakespasm-darwin-makefile-improvements.patch
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/by-name/qu/quakespasm/vulkan.nix
similarity index 100%
rename from pkgs/games/quakespasm/vulkan.nix
rename to pkgs/by-name/qu/quakespasm/vulkan.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c47c76a19619..ac4c21b29bea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13333,8 +13333,7 @@ with pkgs;
     quake3hires
     ;
 
-  quakespasm = callPackage ../games/quakespasm { };
-  vkquake = callPackage ../games/quakespasm/vulkan.nix { };
+  vkquake = callPackage ../by-name/qu/quakespasm/vulkan.nix { };
 
   rogue = callPackage ../games/rogue {
     ncurses = ncurses5;

From 018e0aec1a7fb8df2811c2aacd1f69057ac3cd13 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:57:42 -0700
Subject: [PATCH 04/22] scummvm: modernize, move to by-name/

---
 pkgs/{games => by-name/sc}/scummvm/games.nix       |  0
 .../default.nix => by-name/sc/scummvm/package.nix} | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{games => by-name/sc}/scummvm/games.nix (100%)
 rename pkgs/{games/scummvm/default.nix => by-name/sc/scummvm/package.nix} (88%)

diff --git a/pkgs/games/scummvm/games.nix b/pkgs/by-name/sc/scummvm/games.nix
similarity index 100%
rename from pkgs/games/scummvm/games.nix
rename to pkgs/by-name/sc/scummvm/games.nix
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/by-name/sc/scummvm/package.nix
similarity index 88%
rename from pkgs/games/scummvm/default.nix
rename to pkgs/by-name/sc/scummvm/package.nix
index 54e4c74bd414..15831abecef0 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/by-name/sc/scummvm/package.nix
@@ -23,14 +23,14 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "scummvm";
   version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "scummvm";
     repo = "scummvm";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-+MM47piuXuIBmAQd0g/cAg5t02qSQ0sw/DwFrMUSIAA=";
   };
 
@@ -82,12 +82,12 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
     mainProgram = "scummvm";
     homepage = "https://www.scummvm.org/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.peterhoeg ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac4c21b29bea..044183deddec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13343,9 +13343,7 @@ with pkgs;
     buildShareware = true;
   };
 
-  scummvm = callPackage ../games/scummvm { };
-
-  inherit (callPackage ../games/scummvm/games.nix { })
+  inherit (callPackage ../by-name/sc/scummvm/games.nix { })
     beneath-a-steel-sky
     broken-sword-25
     drascula-the-vampire-strikes-back

From b427fd4b306494d05f90583a675ad9b186231e05 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:02:51 -0700
Subject: [PATCH 05/22] npush: modernize, move to by-name/

---
 .../default.nix => by-name/np/npush/package.nix}     | 12 ++++++------
 pkgs/{games => by-name/np}/npush/run.nix             |  0
 pkgs/top-level/all-packages.nix                      |  3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/{games/npush/default.nix => by-name/np/npush/package.nix} (79%)
 rename pkgs/{games => by-name/np}/npush/run.nix (100%)

diff --git a/pkgs/games/npush/default.nix b/pkgs/by-name/np/npush/package.nix
similarity index 79%
rename from pkgs/games/npush/default.nix
rename to pkgs/by-name/np/npush/package.nix
index 137f8d041165..b8ef0bbe4ad9 100644
--- a/pkgs/games/npush/default.nix
+++ b/pkgs/by-name/np/npush/package.nix
@@ -5,12 +5,12 @@
   ncurses,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "npush";
   version = "0.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/npush/${pname}/${version}/${pname}-${version}.tgz";
+    url = "mirror://sourceforge/project/npush/npush/${finalAttrs.version}/npush-${finalAttrs.version}.tgz";
     hash = "sha256-8hbSsyeehzd4T3fUhDyebyI/oTHOHr3a8ArYAquivNk=";
   };
 
@@ -42,13 +42,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://npush.sourceforge.net/";
     description = "Sokoban-like game";
     mainProgram = "npush";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = with platforms; unix;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/games/npush/run.nix b/pkgs/by-name/np/npush/run.nix
similarity index 100%
rename from pkgs/games/npush/run.nix
rename to pkgs/by-name/np/npush/run.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 044183deddec..f170b716b22e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13267,8 +13267,7 @@ with pkgs;
 
   blightmud-tts = callPackage ../games/blightmud { withTTS = true; };
 
-  npush = callPackage ../games/npush { };
-  run-npush = callPackage ../games/npush/run.nix { };
+  run-npush = callPackage ../by-name/np/npush/run.nix { };
 
   openloco = pkgsi686Linux.callPackage ../games/openloco { };
 

From 36c03b6a2db76eed82a774e06727fc37660e8dfd Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:11:16 -0700
Subject: [PATCH 06/22] blightmud: modernize, move to by-name/

---
 .../bl/blightmud/package.nix}                      | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{games/blightmud/default.nix => by-name/bl/blightmud/package.nix} (89%)

diff --git a/pkgs/games/blightmud/default.nix b/pkgs/by-name/bl/blightmud/package.nix
similarity index 89%
rename from pkgs/games/blightmud/default.nix
rename to pkgs/by-name/bl/blightmud/package.nix
index 23595aa070c2..aa9341e472c3 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/by-name/bl/blightmud/package.nix
@@ -9,14 +9,14 @@
   withTTS ? false,
   speechd-minimal,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "blightmud";
   version = "5.3.1";
 
   src = fetchFromGitHub {
     owner = "blightmud";
     repo = "blightmud";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk=";
   };
 
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
     in
     builtins.concatStringsSep " " (map skipFlag skipList);
 
-  meta = with lib; {
+  meta = {
     description = "Terminal MUD client written in Rust";
     mainProgram = "blightmud";
     longDescription = ''
@@ -72,8 +72,8 @@ rustPlatform.buildRustPackage rec {
       friendly mode.
     '';
     homepage = "https://github.com/Blightmud/Blightmud";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ cpu ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ cpu ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f170b716b22e..9e2ff27b154b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13263,9 +13263,7 @@ with pkgs;
     lua = lua5_1;
   };
 
-  blightmud = callPackage ../games/blightmud { };
-
-  blightmud-tts = callPackage ../games/blightmud { withTTS = true; };
+  blightmud-tts = callPackage ../by-name/bl/blightmud/package.nix { withTTS = true; };
 
   run-npush = callPackage ../by-name/np/npush/run.nix { };
 

From 745401b28a852b2c9e34dfc0112d6b97e688267d Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:16:13 -0700
Subject: [PATCH 07/22] dxx-rebirth: move to by-name/

---
 pkgs/{games => by-name/dx}/dxx-rebirth/assets.nix         | 0
 pkgs/{games => by-name/dx}/dxx-rebirth/full.nix           | 0
 .../default.nix => by-name/dx/dxx-rebirth/package.nix}    | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/{games => by-name/dx}/dxx-rebirth/assets.nix (100%)
 rename pkgs/{games => by-name/dx}/dxx-rebirth/full.nix (100%)
 rename pkgs/{games/dxx-rebirth/default.nix => by-name/dx/dxx-rebirth/package.nix} (90%)

diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/by-name/dx/dxx-rebirth/assets.nix
similarity index 100%
rename from pkgs/games/dxx-rebirth/assets.nix
rename to pkgs/by-name/dx/dxx-rebirth/assets.nix
diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/by-name/dx/dxx-rebirth/full.nix
similarity index 100%
rename from pkgs/games/dxx-rebirth/full.nix
rename to pkgs/by-name/dx/dxx-rebirth/full.nix
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/by-name/dx/dxx-rebirth/package.nix
similarity index 90%
rename from pkgs/games/dxx-rebirth/default.nix
rename to pkgs/by-name/dx/dxx-rebirth/package.nix
index a0186148e404..8d52835a5457 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/by-name/dx/dxx-rebirth/package.nix
@@ -64,11 +64,11 @@ stdenv.mkDerivation {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Source Port of the Descent 1 and 2 engines";
     homepage = "https://www.dxx-rebirth.com/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = with platforms; linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e2ff27b154b..e5ba669cde58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13127,14 +13127,13 @@ with pkgs;
 
   dfhack = dwarf-fortress-packages.dwarf-fortress-full;
 
-  dxx-rebirth = callPackage ../games/dxx-rebirth { };
 
-  inherit (callPackages ../games/dxx-rebirth/assets.nix { })
+  inherit (callPackages ../by-name/dx/dxx-rebirth/assets.nix { })
     descent1-assets
     descent2-assets
     ;
 
-  inherit (callPackages ../games/dxx-rebirth/full.nix { })
+  inherit (callPackages ../by-name/dx/dxx-rebirth/full.nix { })
     d1x-rebirth-full
     d2x-rebirth-full
     ;

From cc333161fb1d8a3428ab0440fb71317cde2606db Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:30:26 -0700
Subject: [PATCH 08/22] instawow: move to by-name/

---
 .../default.nix => by-name/in/instawow/package.nix}       | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{games/instawow/default.nix => by-name/in/instawow/package.nix} (84%)

diff --git a/pkgs/games/instawow/default.nix b/pkgs/by-name/in/instawow/package.nix
similarity index 84%
rename from pkgs/games/instawow/default.nix
rename to pkgs/by-name/in/instawow/package.nix
index 36d8e6b3cdc4..8a947eff0e16 100644
--- a/pkgs/games/instawow/default.nix
+++ b/pkgs/by-name/in/instawow/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "layday";
     repo = "instawow";
     tag = "v${version}";
-    sha256 = "sha256-NFs8+BUXJEn64TDojG/xkH1O+zZurv0PWY+YDhu2mQY=";
+    hash = "sha256-NFs8+BUXJEn64TDojG/xkH1O+zZurv0PWY+YDhu2mQY=";
   };
 
   extras = [ ]; # Disable GUI, most dependencies are not packaged.
@@ -44,11 +44,11 @@ python3.pkgs.buildPythonApplication rec {
     ]
     ++ plugins;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/layday/instawow";
     description = "World of Warcraft add-on manager CLI and GUI";
     mainProgram = "instawow";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ seirl ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ seirl ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5ba669cde58..229a9935b59c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5028,8 +5028,6 @@ with pkgs;
     indradb-client
     ;
 
-  instawow = callPackage ../games/instawow/default.nix { };
-
   irony-server = callPackage ../development/tools/irony-server {
     # The repository of irony to use -- must match the version of the employed emacs
     # package.  Wishing we could merge it into one irony package, to avoid this issue,

From cd8c6695597caef06e32f156802b8e7c85c28383 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:36:23 -0700
Subject: [PATCH 09/22] koboredux: move to by-name/

---
 .../default.nix => by-name/ko/koboredux/package.nix}         | 5 ++---
 pkgs/top-level/all-packages.nix                              | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{games/koboredux/default.nix => by-name/ko/koboredux/package.nix} (98%)

diff --git a/pkgs/games/koboredux/default.nix b/pkgs/by-name/ko/koboredux/package.nix
similarity index 98%
rename from pkgs/games/koboredux/default.nix
rename to pkgs/by-name/ko/koboredux/package.nix
index d694266934cf..e51cf8a042e9 100644
--- a/pkgs/games/koboredux/default.nix
+++ b/pkgs/by-name/ko/koboredux/package.nix
@@ -14,7 +14,6 @@
 
 let
   inherit (lib)
-    and
     licenses
     maintainers
     optional
@@ -27,8 +26,8 @@ let
 
   main_src = fetchFromGitHub {
     owner = "olofson";
-    repo = pname;
-    rev = "v${version}";
+    repo = "koboredux";
+    tag = "v${version}";
     sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 229a9935b59c..4bd59a5e2e39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13125,7 +13125,6 @@ with pkgs;
 
   dfhack = dwarf-fortress-packages.dwarf-fortress-full;
 
-
   inherit (callPackages ../by-name/dx/dxx-rebirth/assets.nix { })
     descent1-assets
     descent2-assets
@@ -13215,9 +13214,7 @@ with pkgs;
     backend = "tensorrt";
   };
 
-  koboredux = callPackage ../games/koboredux { };
-
-  koboredux-free = callPackage ../games/koboredux {
+  koboredux-free = callPackage ../by-name/ko/koboredux/package.nix {
     useProprietaryAssets = false;
   };
 

From 9fb463902636e7e986d55d226903ee768b47dd1f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:40:47 -0700
Subject: [PATCH 10/22] shattered-pixel-dungeon: modernize, move to by-name/

---
 .../sh}/shattered-pixel-dungeon/deps.json         |  0
 .../shattered-pixel-dungeon/disable-beryx.patch   |  0
 .../experienced-pixel-dungeon/default.nix         |  0
 .../experienced-pixel-dungeon/deps.json           |  0
 .../sh}/shattered-pixel-dungeon/generic.nix       |  0
 .../sh/shattered-pixel-dungeon/package.nix}       |  0
 .../rat-king-adventure/default.nix                |  0
 .../rat-king-adventure/deps.json                  |  0
 .../sh}/shattered-pixel-dungeon/rkpd2/default.nix |  0
 .../sh}/shattered-pixel-dungeon/rkpd2/deps.json   |  0
 .../shorter-pixel-dungeon/default.nix             |  0
 .../shorter-pixel-dungeon/deps.json               |  0
 .../summoning-pixel-dungeon/default.nix           |  0
 .../summoning-pixel-dungeon/deps.json             |  0
 .../disable-git-version.patch                     |  0
 .../tower-pixel-dungeon/default.nix               |  0
 .../tower-pixel-dungeon/deps.json                 |  0
 pkgs/top-level/all-packages.nix                   | 15 ++++++++-------
 18 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/disable-beryx.patch (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/generic.nix (100%)
 rename pkgs/{games/shattered-pixel-dungeon/default.nix => by-name/sh/shattered-pixel-dungeon/package.nix} (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/rat-king-adventure/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/rat-king-adventure/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/rkpd2/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/rkpd2/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json (100%)

diff --git a/pkgs/games/shattered-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch b/pkgs/by-name/sh/shattered-pixel-dungeon/disable-beryx.patch
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/disable-beryx.patch
rename to pkgs/by-name/sh/shattered-pixel-dungeon/disable-beryx.patch
diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/generic.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/generic.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/generic.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/package.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/package.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch b/pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch
rename to pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch
diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bd59a5e2e39..47616aeed9d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13347,15 +13347,16 @@ with pkgs;
     isMobile = true;
   };
 
-  shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { };
-  rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2 { };
-  rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure { };
+  rkpd2 = callPackage ../by-name/sh/shattered-pixel-dungeon/rkpd2 { };
+  rat-king-adventure = callPackage ../by-name/sh/shattered-pixel-dungeon/rat-king-adventure { };
   experienced-pixel-dungeon =
-    callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon
+    callPackage ../by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon
       { };
-  summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { };
-  shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { };
-  tower-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/tower-pixel-dungeon { };
+  summoning-pixel-dungeon =
+    callPackage ../by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon
+      { };
+  shorter-pixel-dungeon = callPackage ../by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon { };
+  tower-pixel-dungeon = callPackage ../by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon { };
 
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;

From 0ae8bcacabf373dfede573376f7b8478abaf55af Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:46:02 -0700
Subject: [PATCH 11/22] doomseeker: modernize, move to by-name/

---
 .../do}/doomseeker/add_gitinfo.patch          |  0
 .../do}/doomseeker/dont_update_gitinfo.patch  |  0
 .../do}/doomseeker/fix_paths.patch            |  0
 .../do/doomseeker/package.nix}                | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 5 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{games/doom-ports => by-name/do}/doomseeker/add_gitinfo.patch (100%)
 rename pkgs/{games/doom-ports => by-name/do}/doomseeker/dont_update_gitinfo.patch (100%)
 rename pkgs/{games/doom-ports => by-name/do}/doomseeker/fix_paths.patch (100%)
 rename pkgs/{games/doom-ports/doomseeker/default.nix => by-name/do/doomseeker/package.nix} (83%)

diff --git a/pkgs/games/doom-ports/doomseeker/add_gitinfo.patch b/pkgs/by-name/do/doomseeker/add_gitinfo.patch
similarity index 100%
rename from pkgs/games/doom-ports/doomseeker/add_gitinfo.patch
rename to pkgs/by-name/do/doomseeker/add_gitinfo.patch
diff --git a/pkgs/games/doom-ports/doomseeker/dont_update_gitinfo.patch b/pkgs/by-name/do/doomseeker/dont_update_gitinfo.patch
similarity index 100%
rename from pkgs/games/doom-ports/doomseeker/dont_update_gitinfo.patch
rename to pkgs/by-name/do/doomseeker/dont_update_gitinfo.patch
diff --git a/pkgs/games/doom-ports/doomseeker/fix_paths.patch b/pkgs/by-name/do/doomseeker/fix_paths.patch
similarity index 100%
rename from pkgs/games/doom-ports/doomseeker/fix_paths.patch
rename to pkgs/by-name/do/doomseeker/fix_paths.patch
diff --git a/pkgs/games/doom-ports/doomseeker/default.nix b/pkgs/by-name/do/doomseeker/package.nix
similarity index 83%
rename from pkgs/games/doom-ports/doomseeker/default.nix
rename to pkgs/by-name/do/doomseeker/package.nix
index eb1b4dedce92..476c522b4a87 100644
--- a/pkgs/games/doom-ports/doomseeker/default.nix
+++ b/pkgs/by-name/do/doomseeker/package.nix
@@ -3,14 +3,11 @@
   stdenv,
   cmake,
   fetchFromBitbucket,
-  wrapQtAppsHook,
   pkg-config,
-  qtbase,
-  qttools,
-  qtmultimedia,
   zlib,
   bzip2,
   xxd,
+  qt5,
 }:
 
 stdenv.mkDerivation {
@@ -31,15 +28,15 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
     cmake
-    qttools
+    qt5.qttools
     pkg-config
     xxd
   ];
   buildInputs = [
-    qtbase
-    qtmultimedia
+    qt5.qtbase
+    qt5.qtmultimedia
     zlib
     bzip2
   ];
@@ -52,12 +49,12 @@ stdenv.mkDerivation {
     ln -s $out/lib/doomseeker/doomseeker $out/bin/
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://doomseeker.drdteam.org/";
     description = "Multiplayer server browser for many Doom source ports";
     mainProgram = "doomseeker";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47616aeed9d8..8f7f0da94d49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13044,8 +13044,6 @@ with pkgs;
 
   ### GAMES/DOOM-PORTS
 
-  doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { };
-
   enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { };
 
   zandronum = callPackage ../games/doom-ports/zandronum { };

From 7c0514d13583bbdb7cfa80c8d672cc7d640a5c5c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:01:18 -0700
Subject: [PATCH 12/22] crawl: move to by-name/

---
 .../{games/crawl/default.nix => by-name/cr/crawl/package.nix} | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{games/crawl/default.nix => by-name/cr/crawl/package.nix} (100%)

diff --git a/pkgs/games/crawl/default.nix b/pkgs/by-name/cr/crawl/package.nix
similarity index 100%
rename from pkgs/games/crawl/default.nix
rename to pkgs/by-name/cr/crawl/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f7f0da94d49..89d54e0b19b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13104,12 +13104,10 @@ with pkgs;
     inherit libGL libGLU libglut;
   };
 
-  crawlTiles = callPackage ../games/crawl {
+  crawlTiles = callPackage ../by-name/cr/crawl/package.nix {
     tileMode = true;
   };
 
-  crawl = callPackage ../games/crawl { };
-
   curseofwar = callPackage ../games/curseofwar { SDL = null; };
   curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
 

From ca5d528578f5d437e942a0cfb2076ecae0079704 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:38:55 -0700
Subject: [PATCH 13/22] qtads: modernize, move to by-name/

---
 .../qt/qtads/package.nix}                     | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 15 deletions(-)
 rename pkgs/{games/qtads/default.nix => by-name/qt/qtads/package.nix} (58%)

diff --git a/pkgs/games/qtads/default.nix b/pkgs/by-name/qt/qtads/package.nix
similarity index 58%
rename from pkgs/games/qtads/default.nix
rename to pkgs/by-name/qt/qtads/package.nix
index 90f6652ac658..ae92c2f70003 100644
--- a/pkgs/games/qtads/default.nix
+++ b/pkgs/by-name/qt/qtads/package.nix
@@ -1,31 +1,31 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   pkg-config,
-  qmake,
   SDL2,
   fluidsynth,
   libsndfile,
   libvorbis,
   mpg123,
-  qtbase,
+  qt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qtads";
   version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "realnc";
     repo = "qtads";
-    rev = "v${version}";
-    sha256 = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
   };
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -34,15 +34,15 @@ mkDerivation rec {
     libsndfile
     libvorbis
     mpg123
-    qtbase
+    qt5.qtbase
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://realnc.github.io/qtads/";
     description = "Multimedia interpreter for TADS games";
     mainProgram = "qtads";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ orivej ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89d54e0b19b0..bb91e16c9856 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13191,8 +13191,6 @@ with pkgs;
 
   gscrabble = python3Packages.callPackage ../games/gscrabble { };
 
-  qtads = qt5.callPackage ../games/qtads { };
-
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
   # used as base package for iortcw forks

From 9cc67cbcdc08538e2f6e87167ef505deda68cf88 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:50:13 -0700
Subject: [PATCH 14/22] pegasus-frontend: modernize, move to by-name/

---
 .../pe/pegasus-frontend/package.nix}          | 41 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 19 insertions(+), 24 deletions(-)
 rename pkgs/{games/pegasus-frontend/default.nix => by-name/pe/pegasus-frontend/package.nix} (62%)

diff --git a/pkgs/games/pegasus-frontend/default.nix b/pkgs/by-name/pe/pegasus-frontend/package.nix
similarity index 62%
rename from pkgs/games/pegasus-frontend/default.nix
rename to pkgs/by-name/pe/pegasus-frontend/package.nix
index 3f5244273c8b..942dc0b24d22 100644
--- a/pkgs/games/pegasus-frontend/default.nix
+++ b/pkgs/by-name/pe/pegasus-frontend/package.nix
@@ -3,15 +3,9 @@
   fetchFromGitHub,
   stdenv,
   cmake,
-  qtbase,
-  qtgraphicaleffects,
-  qtmultimedia,
-  qtsvg,
-  qttools,
-  qtx11extras,
   SDL2,
   sqlite,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -28,26 +22,29 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtsvg
-    qtgraphicaleffects
-    qtx11extras
-    sqlite
-    SDL2
-  ];
+  buildInputs =
+    (with libsForQt5; [
+      qtbase
+      qtmultimedia
+      qtsvg
+      qtgraphicaleffects
+      qtx11extras
+    ])
+    ++ [
+      sqlite
+      SDL2
+    ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross platform, customizable graphical frontend for launching emulators and managing your game collection";
     mainProgram = "pegasus-fe";
     homepage = "https://pegasus-frontend.org/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ tengkuizdihar ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ tengkuizdihar ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb91e16c9856..a7704edd6662 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3568,8 +3568,6 @@ with pkgs;
   pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { };
   pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { };
 
-  pegasus-frontend = libsForQt5.callPackage ../games/pegasus-frontend { };
-
   pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
 
   nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };

From 87624b203e41248c2ad04352153e1ff73d1740fb Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 14:33:20 -0700
Subject: [PATCH 15/22] qgo: modernize, move to by-name/

---
 .../{games => by-name/qg}/qgo/fix-paths.patch |  0
 .../qg/qgo/package.nix}                       | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 11 insertions(+), 15 deletions(-)
 rename pkgs/{games => by-name/qg}/qgo/fix-paths.patch (100%)
 rename pkgs/{games/qgo/default.nix => by-name/qg/qgo/package.nix} (82%)

diff --git a/pkgs/games/qgo/fix-paths.patch b/pkgs/by-name/qg/qgo/fix-paths.patch
similarity index 100%
rename from pkgs/games/qgo/fix-paths.patch
rename to pkgs/by-name/qg/qgo/fix-paths.patch
diff --git a/pkgs/games/qgo/default.nix b/pkgs/by-name/qg/qgo/package.nix
similarity index 82%
rename from pkgs/games/qgo/default.nix
rename to pkgs/by-name/qg/qgo/package.nix
index 68b4a9325b38..6f3b6384f660 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/by-name/qg/qgo/package.nix
@@ -1,18 +1,15 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
+  libsForQt5,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qtmultimedia,
-  qttools,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "qgo";
   version = "unstable-2017-12-18";
 
-  meta = with lib; {
+  meta = {
     description = "Go client based on Qt5";
     mainProgram = "qgo";
     longDescription = ''
@@ -28,8 +25,8 @@ mkDerivation {
       Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean.
     '';
     homepage = "https://github.com/pzorin/qgo";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ zalakain ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ zalakain ];
   };
 
   src = fetchFromGitHub {
@@ -44,11 +41,12 @@ mkDerivation {
     sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h
   '';
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7704edd6662..9068bf30a766 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13052,8 +13052,6 @@ with pkgs;
 
   fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
 
-  qgo = libsForQt5.callPackage ../games/qgo { };
-
   anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { };
   ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });
 

From a3d628aa8b67bd3d3e6bf0fbc200dec51259228e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 14:37:08 -0700
Subject: [PATCH 16/22] vcmi: modernize, move to by-name/

---
 .../vc/vcmi/package.nix}                      | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 16 deletions(-)
 rename pkgs/{games/vcmi/default.nix => by-name/vc/vcmi/package.nix} (82%)

diff --git a/pkgs/games/vcmi/default.nix b/pkgs/by-name/vc/vcmi/package.nix
similarity index 82%
rename from pkgs/games/vcmi/default.nix
rename to pkgs/by-name/vc/vcmi/package.nix
index 88b26e0a1175..b7aa3e7dbdd9 100644
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/by-name/vc/vcmi/package.nix
@@ -16,25 +16,23 @@
   ninja,
   pkg-config,
   python3,
-  qtbase,
-  qttools,
   onetbb,
   unshield,
-  wrapQtAppsHook,
   xz,
   zlib,
   testers,
   vcmi,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vcmi";
   version = "1.6.8";
 
   src = fetchFromGitHub {
     owner = "vcmi";
     repo = "vcmi";
-    rev = version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-k6tkylNXEzU+zzYoFWtx+AkoHQzAwbBxPB2DVevsryw=";
   };
@@ -44,7 +42,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     python3
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -57,8 +55,8 @@ stdenv.mkDerivation rec {
     fuzzylite
     luajit
     minizip
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     onetbb
     xz
     zlib
@@ -97,16 +95,16 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source engine for Heroes of Might and Magic III";
     homepage = "https://vcmi.eu";
-    changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog.md";
-    license = with licenses; [
+    changelog = "https://github.com/vcmi/vcmi/blob/${finalAttrs.src.rev}/ChangeLog.md";
+    license = with lib.licenses; [
       gpl2Plus
       cc-by-sa-40
     ];
-    maintainers = with maintainers; [ azahi ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ azahi ];
+    platforms = lib.platforms.linux;
     mainProgram = "vcmilauncher";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9068bf30a766..834c9c214811 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4146,8 +4146,6 @@ with pkgs;
 
   vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum { };
 
-  vcmi = libsForQt5.callPackage ../games/vcmi { };
-
   video2midi = callPackage ../tools/audio/video2midi {
     pythonPackages = python3Packages;
   };

From d833a664845968330607bd6f2d4b90562d5e33dd Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:24:55 -0700
Subject: [PATCH 17/22] chiaki: modernize, move to by-name/

---
 .../ch/chiaki/package.nix}                    | 27 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 17 deletions(-)
 rename pkgs/{games/chiaki/default.nix => by-name/ch/chiaki/package.nix} (76%)

diff --git a/pkgs/games/chiaki/default.nix b/pkgs/by-name/ch/chiaki/package.nix
similarity index 76%
rename from pkgs/games/chiaki/default.nix
rename to pkgs/by-name/ch/chiaki/package.nix
index 03e5c528ac2f..76bba18cd7c4 100644
--- a/pkgs/games/chiaki/default.nix
+++ b/pkgs/by-name/ch/chiaki/package.nix
@@ -6,24 +6,20 @@
   pkg-config,
   ffmpeg,
   libopus,
-  mkDerivation,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
   SDL2,
   libevdev,
   udev,
-  qtmacextras,
   nanopb,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "chiaki";
   version = "2.2.0";
 
   src = fetchgit {
     url = "https://git.sr.ht/~thestr4ng3r/chiaki";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-mLx2ygMlIuDJt9iT4nIj/dcLGjMvvmneKd49L7C3BQk=";
   };
@@ -31,6 +27,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   postPatch = ''
@@ -42,9 +39,9 @@ mkDerivation rec {
   buildInputs = [
     ffmpeg
     libopus
-    qtbase
-    qtmultimedia
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtsvg
     SDL2
     nanopb
   ]
@@ -53,19 +50,19 @@ mkDerivation rec {
     udev
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    qtmacextras
+    libsForQt5.qtmacextras
   ];
 
   doCheck = true;
 
   installCheckPhase = "$out/bin/chiaki --help";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://git.sr.ht/~thestr4ng3r/chiaki";
     description = "Free and Open Source PlayStation Remote Play Client";
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
     maintainers = [ ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = "chiaki";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 834c9c214811..413f0c04ceec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13078,8 +13078,6 @@ with pkgs;
 
   cataclysm-dda-git = cataclysmDDA.git.tiles;
 
-  chiaki = libsForQt5.callPackage ../games/chiaki { };
-
   chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
 
   cockatrice = libsForQt5.callPackage ../games/cockatrice {

From aa2106ad9b3f6f4f1225afa251389913934f9df4 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:26:51 -0700
Subject: [PATCH 18/22] chiaki-ng: modernize, move to by-name/

---
 .../ch/chiaki-ng/package.nix}                 | 32 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 21 deletions(-)
 rename pkgs/{games/chiaki-ng/default.nix => by-name/ch/chiaki-ng/package.nix} (82%)

diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/by-name/ch/chiaki-ng/package.nix
similarity index 82%
rename from pkgs/games/chiaki-ng/default.nix
rename to pkgs/by-name/ch/chiaki-ng/package.nix
index 3ec054b901ed..1545b1a40148 100644
--- a/pkgs/games/chiaki-ng/default.nix
+++ b/pkgs/by-name/ch/chiaki-ng/package.nix
@@ -8,13 +8,6 @@
   python3,
   ffmpeg,
   libopus,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
-  qtwayland,
-  qtdeclarative,
-  qtwebengine,
   SDL2,
   libevdev,
   udev,
@@ -33,6 +26,7 @@
   lcms2,
   libdovi,
   xxHash,
+  kdePackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "streetpea";
     repo = "chiaki-ng";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7pDQnlElnBkW+Nr6R+NaylZbsGH8dB31nd7jxYD66yQ=";
     fetchSubmodules = true;
   };
@@ -50,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     protobuf
     python3
     python3.pkgs.wrapPython
@@ -61,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     ffmpeg
     libopus
-    qtbase
-    qtmultimedia
-    qtsvg
-    qtdeclarative
-    qtwayland
-    qtwebengine
+    kdePackages.qtbase
+    kdePackages.qtmultimedia
+    kdePackages.qtsvg
+    kdePackages.qtdeclarative
+    kdePackages.qtwayland
+    kdePackages.qtwebengine
     protobuf
     SDL2
     curlFull
@@ -108,16 +102,16 @@ stdenv.mkDerivation (finalAttrs: {
     wrapPythonPrograms
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://streetpea.github.io/chiaki-ng/";
     description = "Next-Generation of Chiaki (the open-source remote play client for PlayStation)";
     # Includes OpenSSL linking exception that we currently have no way
     # to represent.
     #
     # See also: <https://github.com/spdx/license-list-XML/issues/939>
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ devusb ];
-    platforms = platforms.linux;
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ devusb ];
+    platforms = lib.platforms.linux;
     mainProgram = "chiaki";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 413f0c04ceec..30891541bbd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13078,8 +13078,6 @@ with pkgs;
 
   cataclysm-dda-git = cataclysmDDA.git.tiles;
 
-  chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
-
   cockatrice = libsForQt5.callPackage ../games/cockatrice {
     protobuf = protobuf_21;
   };

From c37ed775a74ef97b80ff14b1ec7fc184779d33a2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:33:33 -0700
Subject: [PATCH 19/22] rogue: modernize, move to by-name/

---
 .../ro/rogue/package.nix}                     | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{games/rogue/default.nix => by-name/ro/rogue/package.nix} (54%)

diff --git a/pkgs/games/rogue/default.nix b/pkgs/by-name/ro/rogue/package.nix
similarity index 54%
rename from pkgs/games/rogue/default.nix
rename to pkgs/by-name/ro/rogue/package.nix
index dcb16306767a..67209409c59b 100644
--- a/pkgs/games/rogue/default.nix
+++ b/pkgs/by-name/ro/rogue/package.nix
@@ -2,30 +2,30 @@
   lib,
   stdenv,
   fetchurl,
-  ncurses,
+  ncurses5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rogue";
   version = "5.4.4";
 
   src = fetchurl {
     urls = [
-      "https://src.fedoraproject.org/repo/pkgs/rogue/rogue${version}-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue${version}-src.tar.gz"
-      "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue${version}-src.tar.gz"
-      "http://rogue.rogueforge.net/files/rogue${lib.versions.majorMinor version}/rogue${version}-src.tar.gz"
+      "https://src.fedoraproject.org/repo/pkgs/rogue/rogue${finalAttrs.version}-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue${finalAttrs.version}-src.tar.gz"
+      "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue${finalAttrs.version}-src.tar.gz"
+      "http://rogue.rogueforge.net/files/rogue${lib.versions.majorMinor finalAttrs.version}/rogue${finalAttrs.version}-src.tar.gz"
     ];
     sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses5 ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://rogue.rogueforge.net/rogue-5-4/";
     description = "Final version of the original Rogue game developed for the UNIX operating system";
     mainProgram = "rogue";
-    platforms = platforms.all;
-    license = licenses.bsd3;
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30891541bbd1..c6395d07aee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13310,10 +13310,6 @@ with pkgs;
 
   vkquake = callPackage ../by-name/qu/quakespasm/vulkan.nix { };
 
-  rogue = callPackage ../games/rogue {
-    ncurses = ncurses5;
-  };
-
   rott-shareware = callPackage ../by-name/ro/rott/package.nix {
     buildShareware = true;
   };

From 4dc22b276cceb42866327d92909e06635587241a Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:36:39 -0700
Subject: [PATCH 20/22] soi: modernize, move to by-name/

---
 .../so}/soi/cmake-4-build.patch               |  0
 .../so/soi/package.nix}                       | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 3 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{games => by-name/so}/soi/cmake-4-build.patch (100%)
 rename pkgs/{games/soi/default.nix => by-name/so/soi/package.nix} (74%)

diff --git a/pkgs/games/soi/cmake-4-build.patch b/pkgs/by-name/so/soi/cmake-4-build.patch
similarity index 100%
rename from pkgs/games/soi/cmake-4-build.patch
rename to pkgs/by-name/so/soi/cmake-4-build.patch
diff --git a/pkgs/games/soi/default.nix b/pkgs/by-name/so/soi/package.nix
similarity index 74%
rename from pkgs/games/soi/default.nix
rename to pkgs/by-name/so/soi/package.nix
index d46f093092e1..fdf1a2995284 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/by-name/so/soi/package.nix
@@ -5,27 +5,27 @@
   cmake,
   boost,
   eigen2,
-  lua,
+  lua5_1,
   luabind,
   libGLU,
   libGL,
   SDL,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "soi";
   version = "0.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2";
-    name = "${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${finalAttrs.version}-Source.tar.bz2";
+    name = "soi-${finalAttrs.version}.tar.bz2";
     sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     boost
-    lua
+    lua5_1
     luabind
     libGLU
     libGL
@@ -41,12 +41,12 @@ stdenv.mkDerivation rec {
   # https://github.com/NixOS/nixpkgs/issues/445447
   patches = [ ./cmake-4-build.patch ];
 
-  meta = with lib; {
+  meta = {
     description = "Physics-based puzzle game";
     mainProgram = "soi";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    license = licenses.free;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.free;
     downloadPage = "https://sourceforge.net/projects/soi/files/";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6395d07aee7..9aa120f61dbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13341,10 +13341,6 @@ with pkgs;
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;
 
-  soi = callPackage ../games/soi {
-    lua = lua5_1;
-  };
-
   steam-run = steam.run;
   steam-run-free = steam.run-free;
 

From f25d07b9605d0f9ce684d47120b2a9b613507963 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:55:14 -0700
Subject: [PATCH 21/22] mudlet: modernize, move to by-name/

---
 .../mu/mudlet/package.nix}                    | 34 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 ---
 2 files changed, 15 insertions(+), 23 deletions(-)
 rename pkgs/{games/mudlet/default.nix => by-name/mu/mudlet/package.nix} (87%)

diff --git a/pkgs/games/mudlet/default.nix b/pkgs/by-name/mu/mudlet/package.nix
similarity index 87%
rename from pkgs/games/mudlet/default.nix
rename to pkgs/by-name/mu/mudlet/package.nix
index f8638aaff306..90cc8791a155 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/by-name/mu/mudlet/package.nix
@@ -6,20 +6,16 @@
   cmake,
   git,
   pkg-config,
-  qttools,
   which,
-  wrapQtAppsHook,
   boost,
   hunspell,
   libGLU,
   libsForQt5,
   libsecret,
   libzip,
-  lua,
+  lua5_1,
   pcre,
   pugixml,
-  qtbase,
-  qtmultimedia,
   discord-rpc,
   yajl,
   withDiscordRpc ? false,
@@ -43,7 +39,7 @@ let
         });
       };
     in
-    lua.override { inherit packageOverrides; };
+    lua5_1.override { inherit packageOverrides; };
 
   luaEnv = overrideLua.withPackages (
     ps: with ps; [
@@ -56,14 +52,14 @@ let
     ]
   );
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mudlet";
   version = "4.19.1";
 
   src = fetchFromGitHub {
     owner = "Mudlet";
     repo = "Mudlet";
-    rev = "Mudlet-${version}";
+    rev = "Mudlet-${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-I4RRIfHw9kZwxMlc9pvdtwPpq9EvNJU69WpGgZ+0uiw=";
   };
@@ -81,9 +77,9 @@ stdenv.mkDerivation rec {
     git
     luaEnv
     pkg-config
-    qttools
+    libsForQt5.qttools
     which
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -96,8 +92,8 @@ stdenv.mkDerivation rec {
     luaEnv
     pcre
     pugixml
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
     yajl
   ]
   ++ lib.optional withDiscordRpc discord-rpc;
@@ -129,7 +125,7 @@ stdenv.mkDerivation rec {
     cp -r src/mudlet.app/ $out/Applications/mudlet.app
     mv $out/Applications/mudlet.app/Contents/MacOS/mudlet $out/Applications/mudlet.app/Contents/MacOS/mudlet-unwrapped
     makeQtWrapper $out/Applications/Mudlet.app/Contents/MacOS/mudlet-unwrapped $out/Applications/Mudlet.app/Contents/MacOS/mudlet \
-      --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
+      --set LUA_CPATH "${luaEnv}/lib/lua/${lua5_1.luaversion}/?.so" \
       --prefix LUA_PATH : "$NIX_LUA_PATH" \
       --prefix DYLD_LIBRARY_PATH : "${
         lib.makeLibraryPath (
@@ -146,7 +142,7 @@ stdenv.mkDerivation rec {
     mkdir -pv $out/bin
     cp src/mudlet $out/bin/mudlet-unwrapped
     makeQtWrapper $out/bin/mudlet-unwrapped $out/bin/mudlet \
-      --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
+      --set LUA_CPATH "${luaEnv}/lib/lua/${lua5_1.luaversion}/?.so" \
       --prefix LUA_PATH : "$NIX_LUA_PATH" \
       --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath (
@@ -166,18 +162,18 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Crossplatform mud client";
     homepage = "https://www.mudlet.org/";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       wyvie
       pstn
       cpu
       felixalbrigtsen
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = with lib.platforms; linux ++ darwin;
     broken = stdenv.hostPlatform.isDarwin;
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "mudlet";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9aa120f61dbf..4009daf8a6dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13237,10 +13237,6 @@ with pkgs;
   luanti-client = luanti.override { buildServer = false; };
   luanti-server = luanti.override { buildClient = false; };
 
-  mudlet = libsForQt5.callPackage ../games/mudlet {
-    lua = lua5_1;
-  };
-
   blightmud-tts = callPackage ../by-name/bl/blightmud/package.nix { withTTS = true; };
 
   run-npush = callPackage ../by-name/np/npush/run.nix { };

From cdfda72c650a072ee51083f78166f89801687580 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 16:01:21 -0700
Subject: [PATCH 22/22] openxcom: move to by-name/

---
 .../openxcom/default.nix => by-name/op/openxcom/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{games/openxcom/default.nix => by-name/op/openxcom/package.nix} (96%)

diff --git a/pkgs/games/openxcom/default.nix b/pkgs/by-name/op/openxcom/package.nix
similarity index 96%
rename from pkgs/games/openxcom/default.nix
rename to pkgs/by-name/op/openxcom/package.nix
index e17ea01a0e8d..275c1191ef8c 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/by-name/op/openxcom/package.nix
@@ -7,7 +7,7 @@
   libGL,
   openssl,
   pkg-config,
-  SDL,
+  SDL_compat,
   SDL_image,
   SDL_mixer,
   SDL_gfx,
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     boost
     libGL
     libGLU
-    SDL
+    SDL_compat
     SDL_gfx
     SDL_image
     SDL_mixer
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4009daf8a6dc..4cf105e26898 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13267,8 +13267,6 @@ with pkgs;
   openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { };
   openttd-nml = callPackage ../games/openttd/nml.nix { };
 
-  openxcom = callPackage ../games/openxcom { SDL = SDL_compat; };
-
   openxray = callPackage ../games/openxray {
     # Builds with Clang, but hits an assertion failure unless GCC is used
     # https://github.com/OpenXRay/xray-16/issues/1224