JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #216072 from illdefined/akkoma

Browse Source 
akkoma: 3.5.0 → 3.6.0
This commit is contained in:
K900 2023-02-14 22:43:49 +03:00 committed by GitHub
commit 03ce4617e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 177 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/web-apps/akkoma.md
View File

@ -152,7 +152,7 @@ services.akkoma.config.":pleroma".":media_preview_proxy" = {
## Frontend management {#modules-services-akkoma-frontend-management} ## 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 modified by setting
[{option}`services.akkoma.frontends`](options.html#opt-services.akkoma.frontends). [{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. derivation.
```nix ```nix
services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" {
config = builtins.toJSON { config = builtins.toJSON {
expertLevel = 1; expertLevel = 1;
collapseMessageWithSubject = false; collapseMessageWithSubject = false;
@ -177,10 +177,10 @@ services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" {
passAsFile = [ "config" ]; passAsFile = [ "config" ];
} '' } ''
mkdir $out mkdir $out
lndir ${pkgs.akkoma-frontends.pleroma-fe} $out lndir ${pkgs.akkoma-frontends.akkoma-fe} $out
rm $out/static/config.json 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 >$out/static/config.json
''; '';
``` ```

12
nixos/modules/services/web-apps/akkoma.nix
View File

@ -51,13 +51,13 @@ let
package = mkOption { package = mkOption {
type = types.package; type = types.package;
description = mdDoc "Akkoma frontend package."; description = mdDoc "Akkoma frontend package.";
example = literalExpression "pkgs.akkoma-frontends.pleroma-fe"; example = literalExpression "pkgs.akkoma-frontends.akkoma-fe";
}; };
name = mkOption { name = mkOption {
type = types.nonEmptyStr; type = types.nonEmptyStr;
description = mdDoc "Akkoma frontend name."; description = mdDoc "Akkoma frontend name.";
example = "pleroma-fe"; example = "akkoma-fe";
}; };
ref = mkOption { ref = mkOption {
@ -476,8 +476,8 @@ in {
type = with types; attrsOf (submodule frontend); type = with types; attrsOf (submodule frontend);
default = { default = {
primary = { primary = {
package = pkgs.akkoma-frontends.pleroma-fe; package = pkgs.akkoma-frontends.akkoma-fe;
name = "pleroma-fe"; name = "akkoma-fe";
ref = "stable"; ref = "stable";
}; };
admin = { admin = {
@ -489,8 +489,8 @@ in {
defaultText = literalExpression '' defaultText = literalExpression ''
{ {
primary = { primary = {
package = pkgs.akkoma-frontends.pleroma-fe; package = pkgs.akkoma-frontends.akkoma-fe;
name = "pleroma-fe"; name = "akkoma-fe";
ref = "stable"; ref = "stable";
}; };
admin = { admin = {

6
pkgs/servers/akkoma/admin-fe/default.nix
View File

@ -7,14 +7,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "admin-fe"; pname = "admin-fe";
version = "unstable-2022-09-10"; version = "unstable-2023-02-11";
src = fetchFromGitea { src = fetchFromGitea {
domain = "akkoma.dev"; domain = "akkoma.dev";
owner = "AkkomaGang"; owner = "AkkomaGang";
repo = "admin-fe"; repo = "admin-fe";
rev = "e094e12c3ecb540df839fdf20c5a03d10454fcad"; rev = "130c17808bc50269f8444612f4ab378a08cd5e43";
hash = "sha256-dqkW8p4x+5z1Hd8gp8V4+DsLm8EspVwPXDxtvlp1AIk="; hash = "sha256-+ZU8J4rOyRMSZP+CUyLeOhRI2fKiw2s31coTYAoReWM=";
}; };
patches = [ ./deps.patch ]; patches = [ ./deps.patch ];

16
pkgs/servers/akkoma/pleroma-fe/default.nix → pkgs/servers/akkoma/akkoma-fe/default.nix
View File

@ -6,20 +6,20 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pleroma-fe"; pname = "akkoma-fe";
version = "unstable-2022-12-10"; version = "unstable-2023-02-11";
src = fetchFromGitea { src = fetchFromGitea {
domain = "akkoma.dev"; domain = "akkoma.dev";
owner = "AkkomaGang"; owner = "AkkomaGang";
repo = "pleroma-fe"; repo = "akkoma-fe";
rev = "9c9b4cc07c018a21c8261dd7680a97aa3a670756"; rev = "8569b5946eebdb4e7c91252e1dcf88795c8e2538";
hash = "sha256-jYJcG2Q5kxOH29G5WV/6Cx7a+b7FuFROEn/8ruh7cDc="; hash = "sha256-fIkfKAFrcCioma3Hb0c20rfSWXevwWeJbyJm+dUSNlQ=";
}; };
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock"; yarnLock = src + "/yarn.lock";
hash = "sha256-pz6NHBYZRi+Rwx6H74895vFWGLSivI7Ul8XV6wMbgJg="; hash = "sha256-Uet3zdjLdI4qpiuU4CtW2WwWGcFaOhotLLKfnsAUqho=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
description = "Frontend for Akkoma and Pleroma"; description = "Frontend for Akkoma";
homepage = "https://akkoma.dev/AkkomaGang/pleroma-fe/"; homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/";
license = licenses.agpl3; license = licenses.agpl3;
maintainers = with maintainers; [ mvs ]; maintainers = with maintainers; [ mvs ];
}; };

51
pkgs/servers/akkoma/default.nix
View File

@ -9,14 +9,14 @@
beamPackages.mixRelease rec { beamPackages.mixRelease rec {
pname = "pleroma"; pname = "pleroma";
version = "3.5.0"; version = "3.6.0";
src = fetchFromGitea { src = fetchFromGitea {
domain = "akkoma.dev"; domain = "akkoma.dev";
owner = "AkkomaGang"; owner = "AkkomaGang";
repo = "akkoma"; repo = "akkoma";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Apt+6nI4zOCyRb5msPt5UF9vyaendyaOjrYBMl0DqRY="; hash = "sha256-Ovi2AnfkeCDlv3INomPxu8R1ARexOzZHC8dOLucrDaQ=";
}; };
postPatch = '' postPatch = ''
@ -52,24 +52,16 @@ beamPackages.mixRelease rec {
sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c"; sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c";
}; };
}; };
crypt = beamPackages.buildRebar3 rec { credo = beamPackages.buildMix rec {
name = "crypt"; name = "credo";
version = "0.4.3"; version = "1.7.0-dev";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "msantos"; owner = "rrrene";
repo = "crypt"; repo = "credo";
rev = "f75cd55325e33cbea198fb41fe41871392f8fb76"; rev = "1c1b99ea41a457761383d81aaf6a606913996fe7";
sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o="; 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 { elasticsearch = beamPackages.buildMix rec {
name = "elasticsearch"; name = "elasticsearch";
@ -83,17 +75,6 @@ beamPackages.mixRelease rec {
hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0="; 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 { linkify = beamPackages.buildMix rec {
name = "linkify"; name = "linkify";
version = "0.5.2"; version = "0.5.2";
@ -120,20 +101,6 @@ beamPackages.mixRelease rec {
beamDeps = with final; [ phoenix_view temple ]; 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 { search_parser = beamPackages.buildMix rec {
name = "search_parser"; name = "search_parser";
version = "0.1.0"; version = "0.1.0";

214
pkgs/servers/akkoma/mix.nix
View File

@ -8,6 +8,19 @@ let
self = packages // (overrides self packages); self = packages // (overrides self packages);
packages = with beamPackages; with self; { packages = with beamPackages; with self; {
argon2_elixir = buildMix rec {
name = "argon2_elixir";
version = "3.0.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0mywrvzzm76glvajzxrdg6ka49xby30fpk9zl4dxamzm18kknxcb";
};
beamDeps = [ comeonin elixir_make ];
};
base62 = buildMix rec { base62 = buildMix rec {
name = "base62"; name = "base62";
version = "1.2.2"; version = "1.2.2";
@ -75,12 +88,12 @@ let
cachex = buildMix rec { cachex = buildMix rec {
name = "cachex"; name = "cachex";
version = "3.4.0"; version = "3.5.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1rfbbij81zmk6p75z33wg04mfcjqsxzzh67vclllvfjgmfqj609p"; sha256 = "0jdh08np2d85h57s6718jb5xzjkc882g9knd12xgzn8d43xfphps";
}; };
beamDeps = [ eternal jumper sleeplocks unsafe ]; beamDeps = [ eternal jumper sleeplocks unsafe ];
@ -101,12 +114,12 @@ let
castore = buildMix rec { castore = buildMix rec {
name = "castore"; name = "castore";
version = "0.1.19"; version = "0.1.20";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0291pdk3x7qzbv8laris1y90vi7g9akmykd23m2fz0nwlmhh2vp9"; sha256 = "12n9bb4v9b9sx9xk11k98s4f4a532dmmn0x4ak28dj990mjvf850";
}; };
beamDeps = []; beamDeps = [];
@ -229,19 +242,6 @@ let
beamDeps = []; beamDeps = [];
}; };
credo = buildMix rec {
name = "credo";
version = "1.6.7";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1lvxzksdrc2lbl0rzrww4q5rmayf37q0phcpz2kyvxq7n2zi1qa1";
};
beamDeps = [ bunt file_system jason ];
};
custom_base = buildMix rec { custom_base = buildMix rec {
name = "custom_base"; name = "custom_base";
version = "0.2.1"; version = "0.2.1";
@ -294,14 +294,27 @@ let
beamDeps = []; beamDeps = [];
}; };
earmark = buildMix rec { dialyxir = buildMix rec {
name = "earmark"; name = "dialyxir";
version = "1.4.33"; version = "1.2.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "01mfb0c1vq72pira1622cmvaly2p6n4dxwmsrw10i9x0srii7cr1"; sha256 = "0qw4zyd86fjwsav744jvz1wpdbmy9nz645xqr9s1d1bs88v221v1";
};
beamDeps = [ erlex ];
};
earmark = buildMix rec {
name = "earmark";
version = "1.4.34";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "012mwv4ixll3gmav9v0wzlin2948ghb2imnp20xi6nyqvbrhdcch";
}; };
beamDeps = [ earmark_parser ]; beamDeps = [ earmark_parser ];
@ -335,12 +348,12 @@ let
ecto = buildMix rec { ecto = buildMix rec {
name = "ecto"; name = "ecto";
version = "3.9.2"; version = "3.9.4";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "05cxg8rq6rawmn8ryfks5hj7h9b4k9bxxsn7k8l5b7p0fx8nsii1"; sha256 = "0xgfz1pzylj22k0qa8zh4idvd4139b1lwnmq33na8fia2j69hpyy";
}; };
beamDeps = [ decimal jason telemetry ]; beamDeps = [ decimal jason telemetry ];
@ -374,12 +387,12 @@ let
ecto_sql = buildMix rec { ecto_sql = buildMix rec {
name = "ecto_sql"; name = "ecto_sql";
version = "3.9.1"; version = "3.9.2";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "060iqmkqnsyy2kv05s218ady9lgnz7rvgknwz6xjks7jzyj71m2z"; sha256 = "0w1zplm8ndf10dwxffg60iwzvbz3hyyiy761x91cvnwg6nsfxd8y";
}; };
beamDeps = [ db_connection ecto postgrex telemetry ]; beamDeps = [ db_connection ecto postgrex telemetry ];
@ -398,6 +411,19 @@ let
beamDeps = []; beamDeps = [];
}; };
erlex = buildMix rec {
name = "erlex";
version = "0.2.6";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif";
};
beamDeps = [];
};
eternal = buildMix rec { eternal = buildMix rec {
name = "eternal"; name = "eternal";
version = "1.2.2"; version = "1.2.2";
@ -426,12 +452,12 @@ let
ex_aws_s3 = buildMix rec { ex_aws_s3 = buildMix rec {
name = "ex_aws_s3"; name = "ex_aws_s3";
version = "2.3.3"; version = "2.4.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "017iswr9m2kwri2m5j3r9m0b7hk4vqqddbqy09k5d4nfz6vg0i00"; sha256 = "1fsngrldq2g3i2f7y5m4d85sd7hx4jiwnfcxhs14bnalfziadpc5";
}; };
beamDeps = [ ex_aws sweet_xml ]; beamDeps = [ ex_aws sweet_xml ];
@ -491,12 +517,12 @@ let
excoveralls = buildMix rec { excoveralls = buildMix rec {
name = "excoveralls"; name = "excoveralls";
version = "0.12.3"; version = "0.15.1";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1nnsr9dv7mybcxx3y5p2gqzyy3p479w21c55vvsq6hi6dihkx2jn"; sha256 = "1rq7vqvzw7sa2r7n59bhbxbhcnjr6z44dkvq45mdb0h01kcnnhgq";
}; };
beamDeps = [ hackney jason ]; beamDeps = [ hackney jason ];
@ -543,12 +569,12 @@ let
finch = buildMix rec { finch = buildMix rec {
name = "finch"; name = "finch";
version = "0.13.0"; version = "0.14.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1k56zfbadpppn8flavb4aczq0npcqnlhg993l51c1k8dw76pv5a9"; sha256 = "1pd805jyd4qbpb2md3kw443325yqynpkpyr2iixb9zf432psqnal";
}; };
beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ]; beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ];
@ -593,17 +619,17 @@ let
beamDeps = []; beamDeps = [];
}; };
gun = buildRebar3 rec { gettext = buildMix rec {
name = "gun"; name = "gettext";
version = "2.0.0-rc.2"; version = "0.20.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1z2lsbbpl2925z8x2ri0rhp30ccn9d08pgqd2hkxf4342jp1x7bb"; sha256 = "0ggb458h60ch3inndqp9xhbailhb0jkq3xnp85sa94sy8dvv20qw";
}; };
beamDeps = [ cowlib ]; beamDeps = [];
}; };
hackney = buildRebar3 rec { hackney = buildRebar3 rec {
@ -725,12 +751,12 @@ let
jose = buildMix rec { jose = buildMix rec {
name = "jose"; name = "jose";
version = "1.11.2"; version = "1.11.5";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1lj715gzl022yc47qsg9712x8nc9wi7x70msv8c3lpym92y3y54q"; sha256 = "115k981kfg9jmafgs16rybc5qah6p0zgvni3bdyfl0pyp8av5lyw";
}; };
beamDeps = []; beamDeps = [];
@ -749,6 +775,19 @@ let
beamDeps = []; beamDeps = [];
}; };
mail = buildMix rec {
name = "mail";
version = "0.2.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1xbbdkyar8h0pdihfnsd84j1w3vfh9sk3xkz1llxz7y6m67kjawk";
};
beamDeps = [];
};
majic = buildMix rec { majic = buildMix rec {
name = "majic"; name = "majic";
version = "1.0.0"; version = "1.0.0";
@ -907,12 +946,12 @@ let
nimble_options = buildMix rec { nimble_options = buildMix rec {
name = "nimble_options"; name = "nimble_options";
version = "0.4.0"; version = "0.5.2";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0bd0pi3sij9vxhiilv25x6n3jls75g3b38rljvm1x896ycd1qw76"; sha256 = "1q6wa2ljprybfb9w2zg0gbppiwsnimgw5kcvakdp3z8mp42gk9sd";
}; };
beamDeps = []; beamDeps = [];
@ -959,12 +998,12 @@ let
open_api_spex = buildMix rec { open_api_spex = buildMix rec {
name = "open_api_spex"; name = "open_api_spex";
version = "3.10.0"; version = "3.16.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0rc7q857b8zb9vc4c699arjihca353rzm3bfjc31z0ib7pg2pfrd"; sha256 = "0a91jzgq6qp6ba5kxcz8fli2d1l49d8pz8dxikyfhwwbci5f42xv";
}; };
beamDeps = [ jason plug poison ]; beamDeps = [ jason plug poison ];
@ -1024,12 +1063,12 @@ let
phoenix_live_dashboard = buildMix rec { phoenix_live_dashboard = buildMix rec {
name = "phoenix_live_dashboard"; name = "phoenix_live_dashboard";
version = "0.6.5"; version = "0.7.2";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "0lmq1m7k465i9mzw35l7bx69n85mibwzd76976840r43sw6sakzg"; sha256 = "1dq5vj1a6fzclr3fwj7y8rg2xq3yigvgqc3aaq664fvs7h3dypqf";
}; };
beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ];
@ -1037,15 +1076,15 @@ let
phoenix_live_view = buildMix rec { phoenix_live_view = buildMix rec {
name = "phoenix_live_view"; name = "phoenix_live_view";
version = "0.17.12"; version = "0.18.6";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1j4r1pjl60hphan7mf0fn60cnqkdc7hah9zmf4sz8vy1mbhdavdg"; sha256 = "0wvbpi16bfn4hxyqs7907aln5di30v3hskzw2ggp1hy38kxnh9yf";
}; };
beamDeps = [ jason phoenix phoenix_html telemetry ]; beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ];
}; };
phoenix_pubsub = buildMix rec { phoenix_pubsub = buildMix rec {
@ -1102,12 +1141,12 @@ let
plug = buildMix rec { plug = buildMix rec {
name = "plug"; name = "plug";
version = "1.10.4"; version = "1.14.0";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1874ixvvjklg0hnxr6d990qzarvvfxhd4s35c5bfqbixwwzj67md"; sha256 = "056wkb1b17mh5h9ncs2vbswvpjsm2iqc580nmyrvgznlqwr080mz";
}; };
beamDeps = [ mime plug_crypto telemetry ]; beamDeps = [ mime plug_crypto telemetry ];
@ -1204,19 +1243,6 @@ let
beamDeps = []; beamDeps = [];
}; };
quack = buildMix rec {
name = "quack";
version = "0.1.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0hr5ppds4a9vih14hzs3lfj07r5069w8ifr7022fn4j18jkvydnp";
};
beamDeps = [ poison tesla ];
};
ranch = buildRebar3 rec { ranch = buildRebar3 rec {
name = "ranch"; name = "ranch";
version = "1.8.0"; version = "1.8.0";
@ -1232,17 +1258,30 @@ let
recon = buildMix rec { recon = buildMix rec {
name = "recon"; name = "recon";
version = "2.5.2"; version = "2.5.3";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "070f4dgfp1vzvz0fxwavzv9bd7nl5fx3rmmkyr0zy7g9vv426x9c"; sha256 = "1mwr6267lwl4p7f8jfk14s4cszxwra6zgf84hkcxz8fldzs86rkc";
}; };
beamDeps = []; beamDeps = [];
}; };
remote_ip = buildMix rec {
name = "remote_ip";
version = "1.1.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0x7d086iik0h5gcwn2bvx6cjlznqxr1bznj6qlpsgmmadbvgsvv1";
};
beamDeps = [ combine plug ];
};
sleeplocks = buildRebar3 rec { sleeplocks = buildRebar3 rec {
name = "sleeplocks"; name = "sleeplocks";
version = "1.1.2"; version = "1.1.2";
@ -1297,15 +1336,15 @@ let
swoosh = buildMix rec { swoosh = buildMix rec {
name = "swoosh"; name = "swoosh";
version = "1.8.2"; version = "1.9.1";
src = fetchHex { src = fetchHex {
pkg = "${name}"; pkg = "${name}";
version = "${version}"; version = "${version}";
sha256 = "1nxpcwq7ynvqjp65z544dvdfw7jx9k0m58w4kb0bdbdg1rsvln6h"; sha256 = "07ipsrp34s18c9zd5kglqsdc8z7gxa9aadsrklj0zf6azzrzzpvn";
}; };
beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mime plug_cowboy telemetry ]; beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry ];
}; };
syslog = buildRebar3 rec { syslog = buildRebar3 rec {
@ -1360,6 +1399,45 @@ let
beamDeps = [ telemetry ]; beamDeps = [ telemetry ];
}; };
telemetry_metrics_prometheus = buildMix rec {
name = "telemetry_metrics_prometheus";
version = "1.1.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "09jdrv0ik5svi77djycva7a6a8sl05vp2nr7w17s8k94ndckcfyl";
};
beamDeps = [ plug_cowboy telemetry_metrics_prometheus_core ];
};
telemetry_metrics_prometheus_core = buildMix rec {
name = "telemetry_metrics_prometheus_core";
version = "1.1.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0sd0j7arhf22ickzdfmq656258dh14kzi61p0vgra007x1zhxl8d";
};
beamDeps = [ telemetry telemetry_metrics ];
};
telemetry_poller = buildRebar3 rec {
name = "telemetry_poller";
version = "0.5.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1m1zcq65yz0wp1wx7mcy2iq37cyizbzrmv0c11x6xg0hj8375asc";
};
beamDeps = [ telemetry ];
};
tesla = buildMix rec { tesla = buildMix rec {
name = "tesla"; name = "tesla";
version = "1.4.4"; version = "1.4.4";
@ -1370,7 +1448,7 @@ let
sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m"; sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m";
}; };
beamDeps = [ castore finch gun hackney jason mime mint poison telemetry ]; beamDeps = [ castore finch hackney jason mime mint poison telemetry ];
}; };
timex = buildMix rec { timex = buildMix rec {

2
pkgs/top-level/all-packages.nix
View File

@ -1258,7 +1258,7 @@ with pkgs;
akkoma = callPackage ../servers/akkoma { }; akkoma = callPackage ../servers/akkoma { };
akkoma-frontends = recurseIntoAttrs { akkoma-frontends = recurseIntoAttrs {
pleroma-fe = callPackage ../servers/akkoma/pleroma-fe { }; akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };
admin-fe = callPackage ../servers/akkoma/admin-fe { }; admin-fe = callPackage ../servers/akkoma/admin-fe { };
}; };
akkoma-emoji = recurseIntoAttrs { akkoma-emoji = recurseIntoAttrs {