From 4c17535c7be6c0e52e3918fce5c714d93bef4f5d Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Fri, 14 Mar 2025 14:52:45 +0100
Subject: [PATCH] akkoma-frontends.admin-fe: rename to akkoma-admin-fe &
 migrate to pkgs/by-name

---
 nixos/modules/services/web-apps/akkoma.nix           |  4 ++--
 .../ak/akkoma-admin-fe/package.nix}                  |  0
 pkgs/top-level/all-packages.nix                      | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/{servers/akkoma/admin-fe/default.nix => by-name/ak/akkoma-admin-fe/package.nix} (100%)

diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix
index 13a76542ea09..1529d63dde57 100644
--- a/nixos/modules/services/web-apps/akkoma.nix
+++ b/nixos/modules/services/web-apps/akkoma.nix
@@ -525,7 +525,7 @@ in {
             ref = "stable";
           };
           admin = {
-            package = pkgs.akkoma-frontends.admin-fe;
+            package = pkgs.akkoma-admin-fe;
             name = "admin-fe";
             ref = "stable";
           };
@@ -538,7 +538,7 @@ in {
               ref = "stable";
             };
             admin = {
-              package = pkgs.akkoma-frontends.admin-fe;
+              package = pkgs.akkoma-admin-fe;
               name = "admin-fe";
               ref = "stable";
             };
diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix
similarity index 100%
rename from pkgs/servers/akkoma/admin-fe/default.nix
rename to pkgs/by-name/ak/akkoma-admin-fe/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 863a3d570770..5c9019ef7e83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -930,13 +930,13 @@ with pkgs;
       };
     });
   };
-  akkoma-frontends = recurseIntoAttrs {
-    admin-fe = callPackage ../servers/akkoma/admin-fe {
-      nodejs = nodejs_18;
-      yarn = yarn.override { nodejs = nodejs_18; };
-      python3 = python311;
-    };
+
+  akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix {
+    nodejs = nodejs_18;
+    yarn = yarn.override { nodejs = nodejs_18; };
+    python3 = python311;
   };
+
   akkoma-emoji = recurseIntoAttrs {
     blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { };
   };