File tree Expand file tree Collapse file tree 8 files changed +19
-18
lines changed
nixos/modules/services/web-apps Expand file tree Collapse file tree 8 files changed +19
-18
lines changed Original file line number Diff line number Diff line change 9595 package = mkOption {
9696 type = types . package ;
9797 description = "Akkoma frontend package." ;
98- example = literalExpression "pkgs.akkoma-frontends.akkoma- fe" ;
98+ example = literalExpression "pkgs.akkoma-fe" ;
9999 } ;
100100
101101 name = mkOption {
@@ -520,25 +520,25 @@ in {
520520 type = with types ; attrsOf ( submodule frontend ) ;
521521 default = {
522522 primary = {
523- package = pkgs . akkoma-frontends . akkoma- fe;
523+ package = pkgs . akkoma-fe ;
524524 name = "akkoma-fe" ;
525525 ref = "stable" ;
526526 } ;
527527 admin = {
528- package = pkgs . akkoma-frontends . admin-fe ;
528+ package = pkgs . akkoma-admin-fe ;
529529 name = "admin-fe" ;
530530 ref = "stable" ;
531531 } ;
532532 } ;
533533 defaultText = literalExpression ''
534534 {
535535 primary = {
536- package = pkgs.akkoma-frontends.akkoma- fe;
536+ package = pkgs.akkoma-fe;
537537 name = "akkoma-fe";
538538 ref = "stable";
539539 };
540540 admin = {
541- package = pkgs.akkoma-frontends. admin-fe;
541+ package = pkgs.akkoma-admin-fe;
542542 name = "admin-fe";
543543 ref = "stable";
544544 };
557557 default = null ;
558558 example = literalExpression ''
559559 {
560- "emoji/blobs.gg" = pkgs.akkoma-emoji. blobs_gg;
560+ "emoji/blobs.gg" = pkgs.blobs_gg;
561561 "static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" '''
562562 …
563563 ''' ;
Original file line number Diff line number Diff line change 1616
1717stdenv . mkDerivation ( finalAttrs : {
1818 pname = "admin-fe" ;
19- version = "unstable-2024-04-27" ;
19+ version = "2.3.0-2- unstable-2024-04-27" ;
2020
2121 src = fetchFromGitea {
2222 domain = "akkoma.dev" ;
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change @@ -77,6 +77,7 @@ beamPackages.mixRelease rec {
7777 meta = {
7878 description = "ActivityPub microblogging server" ;
7979 homepage = "https://akkoma.social" ;
80+ changelog = "https://akkoma.dev/AkkomaGang/akkoma/releases/tag/v${ version } " ;
8081 license = lib . licenses . agpl3Only ;
8182 maintainers = with lib . maintainers ; [ mvs ] ;
8283 platforms = lib . platforms . unix ;
File renamed without changes.
Original file line number Diff line number Diff line change @@ -148,6 +148,13 @@ mapAliases {
148148 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'" ; # Added 2024-04-21
149149 agda-pkg = throw "agda-pkg has been removed due to being unmaintained" ; # Added 2024-09-10"
150150 ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17." ; # Added 2025-03-12
151+ akkoma-emoji = recurseIntoAttrs {
152+ blobs_gg = lib . warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg ; # Added 2025-03-14
153+ } ;
154+ akkoma-frontends = recurseIntoAttrs {
155+ admin-fe = lib . warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe ; # Added 2025-03-14
156+ akkoma-fe = lib . warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe ; # Added 2025-03-14
157+ } ;
151158 alass = throw "'alass' has been removed due to being unmaintained upstream" ; # Added 2025-01-25
152159 alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'" ; # Converted to throw 2024-10-17
153160 alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'" ; # Converted to throw 2024-10-17
Original file line number Diff line number Diff line change @@ -922,24 +922,17 @@ with pkgs;
922922 type = "OPN";
923923 };
924924
925- akkoma = callPackage ../servers/ akkoma {
925+ akkoma = callPackage ../by-name/ak/ akkoma/package.nix {
926926 beamPackages = beam_nox.packages.erlang_26.extend (self: super: {
927927 elixir = self.elixir_1_16;
928928 rebar3 = self.rebar3WithPlugins {
929929 plugins = with self; [ pc ];
930930 };
931931 });
932932 };
933- akkoma-frontends = recurseIntoAttrs {
934- akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };
935- admin-fe = callPackage ../servers/akkoma/admin-fe {
936- nodejs = nodejs_18;
937- yarn = yarn.override { nodejs = nodejs_18; };
938- python3 = python311;
939- };
940- };
941- akkoma-emoji = recurseIntoAttrs {
942- blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { };
933+
934+ akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix {
935+ python3 = python311;
943936 };
944937
945938 aegisub = callPackage ../by-name/ae/aegisub/package.nix ({
You can’t perform that action at this time.
0 commit comments