From 9b9845f36debdddb7ee6223e2d5e898f9a2c12f1 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Mon, 6 Jul 2026 02:15:57 +0100
Subject: [PATCH] openra: migrate to pkgs/by-name

---
 pkgs/{games => by-name/op}/openra/build-engine.nix |  0
 .../op}/openra/engines/bleed/default.nix           |  0
 .../op}/openra/engines/bleed/deps.json             |  0
 pkgs/by-name/op/openra/engines/default.nix         | 14 ++++++++++++++
 .../op}/openra/engines/release/default.nix         |  0
 .../op}/openra/engines/release/deps.json           |  0
 pkgs/by-name/op/openra/package.nix                 |  4 ++++
 pkgs/{games => by-name/op}/openra/updater.nix      |  0
 pkgs/{games => by-name/op}/openra/updater.sh       |  6 +++---
 pkgs/games/openra/default.nix                      | 13 -------------
 pkgs/top-level/all-packages.nix                    |  4 +---
 11 files changed, 22 insertions(+), 19 deletions(-)
 rename pkgs/{games => by-name/op}/openra/build-engine.nix (100%)
 rename pkgs/{games => by-name/op}/openra/engines/bleed/default.nix (100%)
 rename pkgs/{games => by-name/op}/openra/engines/bleed/deps.json (100%)
 create mode 100644 pkgs/by-name/op/openra/engines/default.nix
 rename pkgs/{games => by-name/op}/openra/engines/release/default.nix (100%)
 rename pkgs/{games => by-name/op}/openra/engines/release/deps.json (100%)
 create mode 100644 pkgs/by-name/op/openra/package.nix
 rename pkgs/{games => by-name/op}/openra/updater.nix (100%)
 rename pkgs/{games => by-name/op}/openra/updater.sh (91%)
 delete mode 100644 pkgs/games/openra/default.nix

diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/by-name/op/openra/build-engine.nix
similarity index 100%
rename from pkgs/games/openra/build-engine.nix
rename to pkgs/by-name/op/openra/build-engine.nix
diff --git a/pkgs/games/openra/engines/bleed/default.nix b/pkgs/by-name/op/openra/engines/bleed/default.nix
similarity index 100%
rename from pkgs/games/openra/engines/bleed/default.nix
rename to pkgs/by-name/op/openra/engines/bleed/default.nix
diff --git a/pkgs/games/openra/engines/bleed/deps.json b/pkgs/by-name/op/openra/engines/bleed/deps.json
similarity index 100%
rename from pkgs/games/openra/engines/bleed/deps.json
rename to pkgs/by-name/op/openra/engines/bleed/deps.json
diff --git a/pkgs/by-name/op/openra/engines/default.nix b/pkgs/by-name/op/openra/engines/default.nix
new file mode 100644
index 000000000000..877b96287d99
--- /dev/null
+++ b/pkgs/by-name/op/openra/engines/default.nix
@@ -0,0 +1,14 @@
+{
+  callPackage,
+}:
+let
+  openRaUpdater = callPackage ../updater.nix { };
+  buildOpenRAEngine = callPackage ../build-engine.nix { inherit openRaUpdater; };
+  callPackage' = path: callPackage path { inherit buildOpenRAEngine; };
+in
+{
+  engines = {
+    release = callPackage' ./release;
+    bleed = callPackage' ./bleed;
+  };
+}
diff --git a/pkgs/games/openra/engines/release/default.nix b/pkgs/by-name/op/openra/engines/release/default.nix
similarity index 100%
rename from pkgs/games/openra/engines/release/default.nix
rename to pkgs/by-name/op/openra/engines/release/default.nix
diff --git a/pkgs/games/openra/engines/release/deps.json b/pkgs/by-name/op/openra/engines/release/deps.json
similarity index 100%
rename from pkgs/games/openra/engines/release/deps.json
rename to pkgs/by-name/op/openra/engines/release/deps.json
diff --git a/pkgs/by-name/op/openra/package.nix b/pkgs/by-name/op/openra/package.nix
new file mode 100644
index 000000000000..27b321a478d4
--- /dev/null
+++ b/pkgs/by-name/op/openra/package.nix
@@ -0,0 +1,4 @@
+{
+  openraPackages,
+}:
+openraPackages.engines.release
diff --git a/pkgs/games/openra/updater.nix b/pkgs/by-name/op/openra/updater.nix
similarity index 100%
rename from pkgs/games/openra/updater.nix
rename to pkgs/by-name/op/openra/updater.nix
diff --git a/pkgs/games/openra/updater.sh b/pkgs/by-name/op/openra/updater.sh
similarity index 91%
rename from pkgs/games/openra/updater.sh
rename to pkgs/by-name/op/openra/updater.sh
index e353c254d10c..d8b06d17c2e2 100644
--- a/pkgs/games/openra/updater.sh
+++ b/pkgs/by-name/op/openra/updater.sh
@@ -1,17 +1,17 @@
 if [[ -z "${UPDATE_NIX_ATTR_PATH:-}" ]]; then
-    echo "Missing UPDATE_NIX_ATTR_PATH - make sure you use mainters/scripts/update.nix to run this script!" 1>&2
+    echo "Missing UPDATE_NIX_ATTR_PATH - make sure you use maintainers/scripts/update.nix to run this script!" 1>&2
     exit 1
 fi
 
 attrPath="$UPDATE_NIX_ATTR_PATH"
 
-nixFilePath="$(pwd)/pkgs/games/openra/engines/$build/default.nix"
+nixFilePath="$(pwd)/pkgs/by-name/op/openra/engines/$build/default.nix"
 if [[ ! -f "$nixFilePath" ]]; then
     echo "$nixFilePath does not exist!" 1>&2
     exit 1
 fi
 
-depsFilePath="$(pwd)/pkgs/games/openra/engines/$build/deps.json"
+depsFilePath="$(pwd)/pkgs/by-name/op/openra/engines/$build/deps.json"
 if [[ ! -f "$depsFilePath" ]]; then
     echo "$depsFilePath does not exist!" 1>&2
     exit 1
diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
deleted file mode 100644
index a164013d3b8c..000000000000
--- a/pkgs/games/openra/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage }:
-
-let
-  openRaUpdater = callPackage ./updater.nix { };
-  buildOpenRAEngine = callPackage ./build-engine.nix { inherit openRaUpdater; };
-  callPackage' = path: callPackage path { inherit buildOpenRAEngine; };
-in
-{
-  engines = {
-    release = callPackage' ./engines/release;
-    bleed = callPackage' ./engines/bleed;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50b8184207a3..6a19fe76ab08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10108,9 +10108,7 @@ with pkgs;
 
   openra_2019 = openraPackages_2019.engines.release;
 
-  openraPackages = recurseIntoAttrs (callPackage ../games/openra { });
-
-  openra = openraPackages.engines.release;
+  openraPackages = recurseIntoAttrs (callPackage ../by-name/op/openra/engines { });
 
   papermcServers = callPackages ../games/papermc { };