diff options
author | Mikael Voss <mvs@nyantec.com> | 2023-02-12 22:56:39 +0100 |
---|---|---|
committer | Mikael Voss <mvs@nyantec.com> | 2023-02-14 20:05:08 +0100 |
commit | 507c66f5b1829b44e660f33ea2d124b07c395bc4 (patch) | |
tree | 746a7f1947d1946b0ba32183cd263f6cc4dd502e | |
parent | 7ea52d1d387fe47fdf29e95bd10de8fabda99e53 (diff) |
pleroma-fe: Rename to akkoma-fe
-rw-r--r-- | nixos/modules/services/web-apps/akkoma.md | 8 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/akkoma.nix | 12 | ||||
-rw-r--r-- | pkgs/servers/akkoma/akkoma-fe/default.nix (renamed from pkgs/servers/akkoma/pleroma-fe/default.nix) | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/nixos/modules/services/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md index fc849be0c8726..5419940a68d63 100644 --- a/nixos/modules/services/web-apps/akkoma.md +++ b/nixos/modules/services/web-apps/akkoma.md @@ -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 ''; ``` diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index fc482ff32debc..8d17752586128 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -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 = { diff --git a/pkgs/servers/akkoma/pleroma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix index 98bd7c520b193..a1f2c43d79ee3 100644 --- a/pkgs/servers/akkoma/pleroma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -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 ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c61ee6febd6c..83f0e16fabcaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |