Unverified Commit 03ce4617 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #216072 from illdefined/akkoma 

akkoma: 3.5.0 → 3.6.0
parents 8cf41cf4 7cccc07a

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/admin-fe/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ 


stdenv.mkDerivation rec {

  pname = "admin-fe";

  version = "unstable-2022-09-10";

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



  src = fetchFromGitea {

    domain = "akkoma.dev";

    owner = "AkkomaGang";

    repo = "admin-fe";

    rev = "e094e12c3ecb540df839fdf20c5a03d10454fcad";

    hash = "sha256-dqkW8p4x+5z1Hd8gp8V4+DsLm8EspVwPXDxtvlp1AIk=";

    rev = "130c17808bc50269f8444612f4ab378a08cd5e43";

    hash = "sha256-+ZU8J4rOyRMSZP+CUyLeOhRI2fKiw2s31coTYAoReWM=";

  };



  patches = [ ./deps.patch ];

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

+8 −8
Original line number Diff line number Diff line
@@ -6,20 +6,20 @@ 
}:



stdenv.mkDerivation rec {

  pname = "pleroma-fe";

  version = "unstable-2022-12-10";

  pname = "akkoma-fe";

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



  src = fetchFromGitea {

    domain = "akkoma.dev";

    owner = "AkkomaGang";

    repo = "pleroma-fe";

    rev = "9c9b4cc07c018a21c8261dd7680a97aa3a670756";

    hash = "sha256-jYJcG2Q5kxOH29G5WV/6Cx7a+b7FuFROEn/8ruh7cDc=";

    repo = "akkoma-fe";

    rev = "8569b5946eebdb4e7c91252e1dcf88795c8e2538";

    hash = "sha256-fIkfKAFrcCioma3Hb0c20rfSWXevwWeJbyJm+dUSNlQ=";

  };



  offlineCache = fetchYarnDeps {

    yarnLock = src + "/yarn.lock";

    hash = "sha256-pz6NHBYZRi+Rwx6H74895vFWGLSivI7Ul8XV6wMbgJg=";

    hash = "sha256-Uet3zdjLdI4qpiuU4CtW2WwWGcFaOhotLLKfnsAUqho=";

  };



  nativeBuildInputs = [
@@ -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/servers/akkoma/default.nix

+9 −42
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ 


beamPackages.mixRelease rec {

  pname = "pleroma";

  version = "3.5.0";

  version = "3.6.0";



  src = fetchFromGitea {

    domain = "akkoma.dev";

    owner = "AkkomaGang";

    repo = "akkoma";

    rev = "v${version}";

    hash = "sha256-Apt+6nI4zOCyRb5msPt5UF9vyaendyaOjrYBMl0DqRY=";

    hash = "sha256-Ovi2AnfkeCDlv3INomPxu8R1ARexOzZHC8dOLucrDaQ=";

  };



  postPatch = ''
@@ -52,24 +52,16 @@ beamPackages.mixRelease rec { 
          sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c";

        };

      };

      crypt = beamPackages.buildRebar3 rec {

        name = "crypt";

        version = "0.4.3";

      credo = beamPackages.buildMix rec {

        name = "credo";

        version = "1.7.0-dev";



        src = fetchFromGitHub {

          owner = "msantos";

          repo = "crypt";

          rev = "f75cd55325e33cbea198fb41fe41871392f8fb76";

          sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o=";

          owner = "rrrene";

          repo = "credo";

          rev = "1c1b99ea41a457761383d81aaf6a606913996fe7";

          hash = "sha256-NdOg6p2J1D8VGGWabAMLs/qRVbi4BzN2DTHci++dJnA=";

        };



        buildInputs = [ libxcrypt ];



        postInstall = ''

          mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so

        '';



        beamDeps = with final; [ elixir_make ];

      };

      elasticsearch = beamPackages.buildMix rec {

        name = "elasticsearch";
@@ -83,17 +75,6 @@ beamPackages.mixRelease rec { 
          hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0=";

        };

      };

      gettext = beamPackages.buildMix {

        name = "gettext";

        version = "0.19.1";



        src = fetchFromGitHub {

          owner = "tusooa";

          repo = "gettext";

          rev = "72fb2496b6c5280ed911bdc3756890e7f38a4808";

          hash = "sha256-V0qmE+LcAbVoWsJmWE4fwrduYFIZ5BzK/sGzgLY3eH0=";

        };

      };

      linkify = beamPackages.buildMix rec {

        name = "linkify";

        version = "0.5.2";
@@ -120,20 +101,6 @@ beamPackages.mixRelease rec { 


        beamDeps = with final; [ phoenix_view temple ];

      };

      remote_ip = beamPackages.buildMix rec {

        name = "remote_ip";

        version = "0.1.5";



        src = fetchFromGitLab {

          domain = "git.pleroma.social";

          group = "pleroma";

          owner = "elixir-libraries";

          repo = "remote_ip";

          rev = "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8";

          sha256 = "0c7vmakcxlcs3j040018i7bfd6z0yq6fjfig02g5fgakx398s0x6";

        };

        beamDeps = with final; [ combine plug inet_cidr ];

      };

      search_parser = beamPackages.buildMix rec {

        name = "search_parser";

        version = "0.1.0";