From 30cbef7dc9d89656a96c48a55442c764b1761dd6 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Fri, 14 Mar 2025 14:48:19 +0100
Subject: [PATCH] akkoma-fe: migrate to pkgs/by-name

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

diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix
index 1b7cc0fa54c9..13a76542ea09 100644
--- a/nixos/modules/services/web-apps/akkoma.nix
+++ b/nixos/modules/services/web-apps/akkoma.nix
@@ -95,7 +95,7 @@ let
       package = mkOption {
         type = types.package;
         description = "Akkoma frontend package.";
-        example = literalExpression "pkgs.akkoma-frontends.akkoma-fe";
+        example = literalExpression "pkgs.akkoma-fe";
       };
 
       name = mkOption {
@@ -520,7 +520,7 @@ in {
         type = with types; attrsOf (submodule frontend);
         default = {
           primary = {
-            package = pkgs.akkoma-frontends.akkoma-fe;
+            package = pkgs.akkoma-fe;
             name = "akkoma-fe";
             ref = "stable";
           };
@@ -533,7 +533,7 @@ in {
         defaultText = literalExpression ''
           {
             primary = {
-              package = pkgs.akkoma-frontends.akkoma-fe;
+              package = pkgs.akkoma-fe;
               name = "akkoma-fe";
               ref = "stable";
             };
diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/by-name/ak/akkoma-fe/package.nix
similarity index 100%
rename from pkgs/servers/akkoma/akkoma-fe/default.nix
rename to pkgs/by-name/ak/akkoma-fe/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79b47517fb71..863a3d570770 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -931,7 +931,6 @@ with pkgs;
     });
   };
   akkoma-frontends = recurseIntoAttrs {
-    akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };
     admin-fe = callPackage ../servers/akkoma/admin-fe {
       nodejs = nodejs_18;
       yarn = yarn.override { nodejs = nodejs_18; };