From 6a55cc63f3abdf4c1e3cebf0842607dcc9a7f177 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Fri, 14 Mar 2025 15:13:10 +0100
Subject: [PATCH] =?UTF-8?q?akkoma-emoji.blobs=5Fgg:=20move=20to=20top?=
 =?UTF-8?q?=E2=80=90level=20&=20migrate=20to=20pkgs/by-name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nixos/modules/services/web-apps/akkoma.nix                    | 2 +-
 .../emoji/blobs_gg.nix => by-name/bl/blobs_gg/package.nix}    | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 1 insertion(+), 5 deletions(-)
 rename pkgs/{servers/akkoma/emoji/blobs_gg.nix => by-name/bl/blobs_gg/package.nix} (100%)

diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix
index 1529d63dde57..9df89c65a3cf 100644
--- a/nixos/modules/services/web-apps/akkoma.nix
+++ b/nixos/modules/services/web-apps/akkoma.nix
@@ -557,7 +557,7 @@ in {
         default = null;
         example = literalExpression ''
           {
-            "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
+            "emoji/blobs.gg" = pkgs.blobs_gg;
             "static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" '''
               …
             ''';
diff --git a/pkgs/servers/akkoma/emoji/blobs_gg.nix b/pkgs/by-name/bl/blobs_gg/package.nix
similarity index 100%
rename from pkgs/servers/akkoma/emoji/blobs_gg.nix
rename to pkgs/by-name/bl/blobs_gg/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b2e2f135c14..2d697bdfc630 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -935,10 +935,6 @@ with pkgs;
     python3 = python311;
   };
 
-  akkoma-emoji = recurseIntoAttrs {
-    blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { };
-  };
-
   aegisub = callPackage ../by-name/ae/aegisub/package.nix ({
     luajit = luajit.override { enable52Compat = true; };
   } // (config.aegisub or {}));