From f68438a9bb75d466f67f6b6ca8b0dd3202273ed1 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Tue, 22 Oct 2024 18:51:23 +0100
Subject: [PATCH] factorio: migrate to by-name hierarchy

---
 pkgs/{games => by-name/fa}/factorio/mods.nix                | 0
 .../default.nix => by-name/fa/factorio/package.nix}         | 0
 pkgs/{games => by-name/fa}/factorio/update.py               | 4 ++--
 pkgs/{games => by-name/fa}/factorio/utils.nix               | 0
 pkgs/{games => by-name/fa}/factorio/versions.json           | 0
 pkgs/top-level/all-packages.nix                             | 6 +++---
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/{games => by-name/fa}/factorio/mods.nix (100%)
 rename pkgs/{games/factorio/default.nix => by-name/fa/factorio/package.nix} (100%)
 rename pkgs/{games => by-name/fa}/factorio/update.py (99%)
 rename pkgs/{games => by-name/fa}/factorio/utils.nix (100%)
 rename pkgs/{games => by-name/fa}/factorio/versions.json (100%)

diff --git a/pkgs/games/factorio/mods.nix b/pkgs/by-name/fa/factorio/mods.nix
similarity index 100%
rename from pkgs/games/factorio/mods.nix
rename to pkgs/by-name/fa/factorio/mods.nix
diff --git a/pkgs/games/factorio/default.nix b/pkgs/by-name/fa/factorio/package.nix
similarity index 100%
rename from pkgs/games/factorio/default.nix
rename to pkgs/by-name/fa/factorio/package.nix
diff --git a/pkgs/games/factorio/update.py b/pkgs/by-name/fa/factorio/update.py
similarity index 99%
rename from pkgs/games/factorio/update.py
rename to pkgs/by-name/fa/factorio/update.py
index 6da1d9dfee7d..7bae68773e5a 100755
--- a/pkgs/games/factorio/update.py
+++ b/pkgs/by-name/fa/factorio/update.py
@@ -55,9 +55,9 @@ SYSTEMS = [
 
 RELEASE_TYPES = [
     ReleaseType("alpha", needs_auth=True),
-    ReleaseType("expansion", needs_auth=True),
     ReleaseType("demo"),
     ReleaseType("headless"),
+    ReleaseType("expansion", needs_auth=True),
 ]
 
 RELEASE_CHANNELS = [
@@ -69,7 +69,7 @@ RELEASE_CHANNELS = [
 def find_versions_json() -> str:
     if FLAGS.out:
         return FLAGS.out
-    try_paths = ["pkgs/games/factorio/versions.json", "versions.json"]
+    try_paths = ["pkgs/by-name/fa/factorio/versions.json", "versions.json"]
     for path in try_paths:
         if os.path.exists(path):
             return path
diff --git a/pkgs/games/factorio/utils.nix b/pkgs/by-name/fa/factorio/utils.nix
similarity index 100%
rename from pkgs/games/factorio/utils.nix
rename to pkgs/by-name/fa/factorio/utils.nix
diff --git a/pkgs/games/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
similarity index 100%
rename from pkgs/games/factorio/versions.json
rename to pkgs/by-name/fa/factorio/versions.json
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57b2f2deddc2..9d2edb9fbd08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34534,7 +34534,7 @@ with pkgs;
     fltk = fltk-minimal;
   };
 
-  factorio = callPackage ../games/factorio { releaseType = "alpha"; };
+  factorio = callPackage ../by-name/fa/factorio/package.nix { releaseType = "alpha"; };
 
   factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; };
 
@@ -34548,9 +34548,9 @@ with pkgs;
 
   factorio-space-age-experimental = factorio.override { releaseType = "expansion"; experimental = true; };
 
-  factorio-mods = callPackage ../games/factorio/mods.nix { };
+  factorio-mods = callPackage ../by-name/fa/factorio/mods.nix { };
 
-  factorio-utils = callPackage ../games/factorio/utils.nix { };
+  factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { };
 
   fairymax = callPackage ../games/fairymax { };