From 1a0a0ef0abe8fcc840daa5a6d2962fbfa4eb29f8 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Wed, 10 Dec 2025 19:34:27 -0500 Subject: [PATCH] akkoma: remove all-packages.nix definition --- pkgs/by-name/ak/akkoma/package.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 11 ----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ak/akkoma/package.nix b/pkgs/by-name/ak/akkoma/package.nix index 02f4e56fcd2c..22157be35fb4 100644 --- a/pkgs/by-name/ak/akkoma/package.nix +++ b/pkgs/by-name/ak/akkoma/package.nix @@ -1,6 +1,6 @@ { lib, - beamPackages, + beam_minimal, fetchFromGitea, cmake, file, @@ -8,6 +8,16 @@ nix-update-script, }: +let + beamPackages = beam_minimal.packages.erlang_26.extend ( + self: super: { + elixir = self.elixir_1_16; + rebar3 = self.rebar3WithPlugins { + plugins = with self; [ pc ]; + }; + } + ); +in beamPackages.mixRelease rec { pname = "akkoma"; version = "3.17.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69aeee083d1c..c1e012f2a55d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -974,17 +974,6 @@ with pkgs; opnplug = adlplug.override { type = "OPN"; }; - akkoma = callPackage ../by-name/ak/akkoma/package.nix { - beamPackages = beam_minimal.packages.erlang_26.extend ( - self: super: { - elixir = self.elixir_1_16; - rebar3 = self.rebar3WithPlugins { - plugins = with self; [ pc ]; - }; - } - ); - }; - akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix { python3 = python311; };