From 413aa72070f9849c83cf5c831e2b309c3b4a7fa2 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 18 Feb 2026 10:06:19 +0100
Subject: [PATCH] mobilizon: refactor & move to pkgs/by-name

---
 .../mo}/mobilizon/alias.patch                   |  0
 .../mo}/mobilizon/common.nix                    |  0
 .../mo}/mobilizon/frontend.nix                  |  0
 pkgs/{servers => by-name/mo}/mobilizon/mix.nix  |  0
 .../mo/mobilizon/package.nix}                   | 17 +++++++++--------
 pkgs/top-level/all-packages.nix                 |  5 -----
 6 files changed, 9 insertions(+), 13 deletions(-)
 rename pkgs/{servers => by-name/mo}/mobilizon/alias.patch (100%)
 rename pkgs/{servers => by-name/mo}/mobilizon/common.nix (100%)
 rename pkgs/{servers => by-name/mo}/mobilizon/frontend.nix (100%)
 rename pkgs/{servers => by-name/mo}/mobilizon/mix.nix (100%)
 rename pkgs/{servers/mobilizon/default.nix => by-name/mo/mobilizon/package.nix} (91%)

diff --git a/pkgs/servers/mobilizon/alias.patch b/pkgs/by-name/mo/mobilizon/alias.patch
similarity index 100%
rename from pkgs/servers/mobilizon/alias.patch
rename to pkgs/by-name/mo/mobilizon/alias.patch
diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/by-name/mo/mobilizon/common.nix
similarity index 100%
rename from pkgs/servers/mobilizon/common.nix
rename to pkgs/by-name/mo/mobilizon/common.nix
diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/by-name/mo/mobilizon/frontend.nix
similarity index 100%
rename from pkgs/servers/mobilizon/frontend.nix
rename to pkgs/by-name/mo/mobilizon/frontend.nix
diff --git a/pkgs/servers/mobilizon/mix.nix b/pkgs/by-name/mo/mobilizon/mix.nix
similarity index 100%
rename from pkgs/servers/mobilizon/mix.nix
rename to pkgs/by-name/mo/mobilizon/mix.nix
diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/by-name/mo/mobilizon/package.nix
similarity index 91%
rename from pkgs/servers/mobilizon/default.nix
rename to pkgs/by-name/mo/mobilizon/package.nix
index ecc7b6bcd336..6921b882f3a8 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/by-name/mo/mobilizon/package.nix
@@ -2,21 +2,22 @@
   lib,
   callPackage,
   writeShellScriptBin,
-  beamPackages,
+  beam,
   mix2nix,
   fetchFromGitHub,
   git,
   cmake,
   nixosTests,
   nixfmt,
-  mobilizon-frontend,
+  mobilizon-frontend ? callPackage ./frontend.nix { },
 }:
 
 let
-  inherit (beamPackages) mixRelease buildMix;
+  beamPackages = beam.packages.erlang_27.extend (self: super: { elixir = self.elixir_1_18; });
+
   common = callPackage ./common.nix { };
 in
-mixRelease rec {
+beamPackages.mixRelease rec {
   inherit (common) pname version src;
 
   # A typo that is a build failure on elixir 1.18
@@ -59,7 +60,7 @@ mixRelease rec {
         });
 
         # The remainder are Git dependencies (and their deps) that are not supported by mix2nix currently.
-        web_push_encryption = buildMix {
+        web_push_encryption = beamPackages.buildMix {
           name = "web_push_encryption";
           version = "0.3.1";
           src = fetchFromGitHub {
@@ -73,7 +74,7 @@ mixRelease rec {
             jose
           ];
         };
-        icalendar = buildMix rec {
+        icalendar = beamPackages.buildMix rec {
           name = "icalendar";
           version = "1.1.2";
           src = fetchFromGitHub {
@@ -88,7 +89,7 @@ mixRelease rec {
             timex
           ];
         };
-        rajska = buildMix rec {
+        rajska = beamPackages.buildMix rec {
           name = "rajska";
           version = "1.3.3";
           src = fetchFromGitHub {
@@ -106,7 +107,7 @@ mixRelease rec {
             mock
           ];
         };
-        exkismet = buildMix rec {
+        exkismet = beamPackages.buildMix rec {
           name = "exkismet";
           version = "0.0.3";
           src = fetchFromGitHub {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fa9facc09ae..dacde93898d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1843,11 +1843,6 @@ with pkgs;
 
   mkspiffs-presets = recurseIntoAttrs (callPackages ../by-name/mk/mkspiffs/presets.nix { });
 
-  mobilizon = callPackage ../servers/mobilizon {
-    beamPackages = beam.packages.erlang_27.extend (self: super: { elixir = self.elixir_1_18; });
-    mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { };
-  };
-
   nltk-data = recurseIntoAttrs (callPackage ../tools/text/nltk-data { });
 
   seabios-coreboot = seabios.override { ___build-type = "coreboot"; };