Unverified Commit 507c66f5 authored by Mikael Voss's avatar Mikael Voss
Browse files

pleroma-fe: Rename to akkoma-fe

parent 7ea52d1d

nixos/modules/services/web-apps/akkoma.md

+4 −4
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ services.akkoma.config.":pleroma".":media_preview_proxy" = { 


## Frontend management {#modules-services-akkoma-frontend-management}



Akkoma will be deployed with the `pleroma-fe` and `admin-fe` frontends by default. These can be

Akkoma will be deployed with the `akkoma-fe` and `admin-fe` frontends by default. These can be

modified by setting

[{option}`services.akkoma.frontends`](options.html#opt-services.akkoma.frontends).
@@ -160,7 +160,7 @@ The following example overrides the primary frontend’s default configuration u 
derivation.



```nix

services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" {

services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" {

  config = builtins.toJSON {

    expertLevel = 1;

    collapseMessageWithSubject = false;
@@ -177,10 +177,10 @@ services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { 
  passAsFile = [ "config" ];

} ''

  mkdir $out

  lndir ${pkgs.akkoma-frontends.pleroma-fe} $out

  lndir ${pkgs.akkoma-frontends.akkoma-fe} $out



  rm $out/static/config.json

  jq -s add ${pkgs.akkoma-frontends.pleroma-fe}/static/config.json ${config} \

  jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \

    >$out/static/config.json

'';

```

nixos/modules/services/web-apps/akkoma.nix

+6 −6
Original line number Diff line number Diff line
@@ -51,13 +51,13 @@ let 
      package = mkOption {

        type = types.package;

        description = mdDoc "Akkoma frontend package.";

        example = literalExpression "pkgs.akkoma-frontends.pleroma-fe";

        example = literalExpression "pkgs.akkoma-frontends.akkoma-fe";

      };



      name = mkOption {

        type = types.nonEmptyStr;

        description = mdDoc "Akkoma frontend name.";

        example = "pleroma-fe";

        example = "akkoma-fe";

      };



      ref = mkOption {
@@ -476,8 +476,8 @@ in { 
        type = with types; attrsOf (submodule frontend);

        default = {

          primary = {

            package = pkgs.akkoma-frontends.pleroma-fe;

            name = "pleroma-fe";

            package = pkgs.akkoma-frontends.akkoma-fe;

            name = "akkoma-fe";

            ref = "stable";

          };

          admin = {
@@ -489,8 +489,8 @@ in { 
        defaultText = literalExpression ''

          {

            primary = {

              package = pkgs.akkoma-frontends.pleroma-fe;

              name = "pleroma-fe";

              package = pkgs.akkoma-frontends.akkoma-fe;

              name = "akkoma-fe";

              ref = "stable";

            };

            admin = {

pkgs/servers/akkoma/pleroma-fe/default.nix→pkgs/servers/akkoma/akkoma-fe/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
}:



stdenv.mkDerivation rec {

  pname = "pleroma-fe";

  pname = "akkoma-fe";

  version = "unstable-2023-02-11";



  src = fetchFromGitea {
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec { 
  '';



  meta = with lib; {

    description = "Frontend for Akkoma and Pleroma";

    homepage = "https://akkoma.dev/AkkomaGang/pleroma-fe/";

    description = "Frontend for Akkoma";

    homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/";

    license = licenses.agpl3;

    maintainers = with maintainers; [ mvs ];

  };

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ with pkgs; 














  akkoma = callPackage ../servers/akkoma { };















  akkoma-frontends = recurseIntoAttrs {













    pleroma-fe = callPackage ../servers/akkoma/pleroma-fe { };













    akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };















    admin-fe = callPackage ../servers/akkoma/admin-fe { };















  };















  akkoma-emoji = recurseIntoAttrs {