akkoma-*: migrate to pkgs/by-name (#389844)

jopejoe1 97f8e4ee 331a960d

Changed files
+19 -18
nixos
modules
services
web-apps
pkgs
by-name
ak
akkoma
akkoma-admin-fe
akkoma-fe
bl
blobs_gg
top-level
+6 -6
nixos/modules/services/web-apps/akkoma.nix
···
package = mkOption {
type = types.package;
description = "Akkoma frontend package.";
-
example = literalExpression "pkgs.akkoma-frontends.akkoma-fe";
+
example = literalExpression "pkgs.akkoma-fe";
};
name = mkOption {
···
type = with types; attrsOf (submodule frontend);
default = {
primary = {
-
package = pkgs.akkoma-frontends.akkoma-fe;
+
package = pkgs.akkoma-fe;
name = "akkoma-fe";
ref = "stable";
};
admin = {
-
package = pkgs.akkoma-frontends.admin-fe;
+
package = pkgs.akkoma-admin-fe;
name = "admin-fe";
ref = "stable";
};
···
defaultText = literalExpression ''
{
primary = {
-
package = pkgs.akkoma-frontends.akkoma-fe;
+
package = pkgs.akkoma-fe;
name = "akkoma-fe";
ref = "stable";
};
admin = {
-
package = pkgs.akkoma-frontends.admin-fe;
+
package = pkgs.akkoma-admin-fe;
name = "admin-fe";
ref = "stable";
};
···
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" '''
''';
+1 -1
pkgs/servers/akkoma/admin-fe/default.nix pkgs/by-name/ak/akkoma-admin-fe/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "admin-fe";
-
version = "unstable-2024-04-27";
+
version = "2.3.0-2-unstable-2024-04-27";
src = fetchFromGitea {
domain = "akkoma.dev";
pkgs/servers/akkoma/akkoma-fe/default.nix pkgs/by-name/ak/akkoma-fe/package.nix
+1
pkgs/servers/akkoma/default.nix pkgs/by-name/ak/akkoma/package.nix
···
meta = {
description = "ActivityPub microblogging server";
homepage = "https://akkoma.social";
+
changelog = "https://akkoma.dev/AkkomaGang/akkoma/releases/tag/v${version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ mvs ];
platforms = lib.platforms.unix;
pkgs/servers/akkoma/emoji/blobs_gg.nix pkgs/by-name/bl/blobs_gg/package.nix
pkgs/servers/akkoma/mime.exs pkgs/by-name/ak/akkoma/mime.exs
+7
pkgs/top-level/aliases.nix
···
afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10"
ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17."; # Added 2025-03-12
+
akkoma-emoji = recurseIntoAttrs {
+
blobs_gg = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14
+
};
+
akkoma-frontends = recurseIntoAttrs {
+
admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14
+
akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14
+
};
alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25
alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17
alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17
+4 -11
pkgs/top-level/all-packages.nix
···
type = "OPN";
};
-
akkoma = callPackage ../servers/akkoma {
+
akkoma = callPackage ../by-name/ak/akkoma/package.nix {
beamPackages = beam_nox.packages.erlang_26.extend (self: super: {
elixir = self.elixir_1_16;
rebar3 = self.rebar3WithPlugins {
···
};
});
};
-
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; };
-
python3 = python311;
-
};
-
};
-
akkoma-emoji = recurseIntoAttrs {
-
blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { };
+
+
akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix {
+
python3 = python311;
};
aegisub = callPackage ../by-name/ae/aegisub/package.nix ({