Merge pull request 'update' (#302) from update-flake into main

Reviewed-on: #302
This commit is contained in:
Charlotte 🦝 Delenk 2023-08-05 15:28:56 +00:00
commit 36f3049073
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
40 changed files with 3388 additions and 3187 deletions

View file

@ -4,6 +4,7 @@
"date": "2022-12-14T12:05:59+00:00",
"path": "/nix/store/pqj5iqn2y89qfgd33b9jjbn58cq395nn-admin-fe",
"sha256": "0qvr245604yaslvnphx2ybclh51svqi570pzch917jffi8kkr5gr",
"hash": "sha256-+ZU8J4rOyRMSZP+CUyLeOhRI2fKiw2s31coTYAoReWM=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -18,15 +18,15 @@
src = fetchFromGitea {
domain = "akkoma.dev";
owner = "AkkomaGang";
repo = "pleroma-fe";
repo = "akkoma-fe";
inherit (source) rev sha256;
};
patches = [./pleroma-fe.patch ./jxl-polyfill.patch];
patches = [./akkoma-fe.patch ./jxl-polyfill.patch];
};
nodeOptions = callPackage ../../lib/opensslLegacyProvider.nix {};
in
mkYarnPackage rec {
pname = "pleroma-fe";
pname = "akkoma-fe";
version = source.date;
inherit src;
packageJSON = ./package.json;
@ -61,18 +61,18 @@ in
find $out -type f -name '*.svg' -execdir ${nodePackages.svgo}/bin/svgo {} \;
'';
passthru = {
updateScript = writeScript "update-pleroma-fe" ''
${../../scripts/update-git.sh} https://akkoma.dev/AkkomaGang/pleroma-fe.git akkoma/pleroma-fe/source.json
if [ "$(git diff -- akkoma/pleroma-fe/source.json)" ]; then
updateScript = writeScript "update-akkoma-fe" ''
${../../scripts/update-git.sh} https://akkoma.dev/AkkomaGang/akkoma-fe.git akkoma/akkoma-fe/source.json
if [ "$(git diff -- akkoma/akkoma-fe/source.json)" ]; then
SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
${../../scripts/update-yarn.sh} $SRC_PATH akkoma/pleroma-fe
${../../scripts/update-yarn.sh} $SRC_PATH akkoma/akkoma-fe
fi
'';
};
meta = with lib; {
description = "Frontend for Akkoma and Pleroma";
homepage = "https://akkoma.dev/AkkomaGang/pleroma-fe/";
description = "Frontend for Akkoma and akkoma";
homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/";
license = licenses.agpl3;
};
}

View file

@ -1,6 +1,6 @@
{
"name": "pleroma_fe",
"version": "3.5.0",
"version": "3.10.0",
"description": "A frontend for Akkoma instances",
"author": "Roger Braun <roger@rogerbraun.net>",
"private": true,

View file

@ -0,0 +1,12 @@
{
"url": "https://akkoma.dev/AkkomaGang/pleroma-fe.git",
"rev": "174f98b1cb0c3f506026f15f4efbde59739b8264",
"date": "2023-08-05T14:17:42+01:00",
"path": "/nix/store/0wdc2psw5mfqghm4ni64pc8096c2fgk3-pleroma-fe",
"sha256": "14haa7x7y3nl8r7k3q13d5h6c1kdidxl1wf2fp1xiv02kfk9y685",
"hash": "sha256-BRmfppsC7NjDdcLxQHuLbQZmYGkj4DFPRtQOf/pRCpI=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

View file

@ -51,7 +51,7 @@ in
overrides = final: prev: {
# mix2nix does not support git dependencies yet,
# so we need to add them manually
captcha = beamPackages.buildMix rec {
captcha = beamPackages.buildMix {
name = "captcha";
version = "0.1.0";
@ -60,26 +60,24 @@ in
group = "pleroma";
owner = "elixir-libraries";
repo = "elixir-captcha";
rev = "e0f16822d578866e186a0974d65ad58cddc1e2ab";
sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c";
rev = "3bbfa8b5ea13accc1b1c40579a380d8e5cfd6ad2";
sha256 = "1fknjlshc52hrd841rw5incp47h1fk20h068gq9mbskq051p8imj";
};
beamDeps = with final; [];
beamDeps = [];
};
crypt = beamPackages.buildRebar3 rec {
name = "crypt";
version = "0.4.3";
concurrent_limiter = beamPackages.buildMix rec {
name = "concurrent_limiter";
version = "0.1.1";
src = fetchFromGitHub {
owner = "msantos";
repo = "crypt";
rev = "f75cd55325e33cbea198fb41fe41871392f8fb76";
sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o=";
src = fetchFromGitea {
domain = "akkoma.dev";
owner = "AkkomaGang";
repo = "concurrent-limiter";
rev = "a9e0b3d64574bdba761f429bb4fba0cf687b3338";
hash = "sha256-A7ucZnXks4K+JDVY5vV2cT5KfEOUOo/OHO4rga5mGys=";
};
postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so";
beamDeps = with final; [elixir_make];
buildInputs = [libxcrypt];
beamDeps = with final; [];
};
elasticsearch = beamPackages.buildMix rec {
name = "elasticsearch";

View file

@ -13,12 +13,12 @@
with self; {
argon2_elixir = buildMix rec {
name = "argon2_elixir";
version = "3.0.0";
version = "3.1.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0mywrvzzm76glvajzxrdg6ka49xby30fpk9zl4dxamzm18kknxcb";
sha256 = "0wyxj4197jnz4z38611f00ym5n3w7hv06l4l3dfid4h2xvhfm3y0";
};
beamDeps = [comeonin elixir_make];
@ -52,12 +52,12 @@
bcrypt_elixir = buildMix rec {
name = "bcrypt_elixir";
version = "2.3.1";
version = "3.0.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0ybjs37fyn45x31lzhxic4kd4jmzwcwkgy4spwayykbn8rgjs622";
sha256 = "1kwnzcjf6v4af12nzw5b2fksk1m1fvbxvhclczy1wpb4zdgbjss8";
};
beamDeps = [comeonin elixir_make];
@ -117,12 +117,12 @@
castore = buildMix rec {
name = "castore";
version = "0.1.22";
version = "1.0.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1b1cl89fzkykimxwgm8mwb9wmxcrd8qk8hfc83pa2npb8zgpcxf1";
sha256 = "02rrljx2f6zhmiwqwyk7al0gdf66qpx4jm59sqg1cnyiylgb02k8";
};
beamDeps = [];
@ -167,19 +167,6 @@
beamDeps = [];
};
concurrent_limiter = buildMix rec {
name = "concurrent_limiter";
version = "0.1.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1sqnb987qwwy4ip7kxh9g7vv5wz61fpv3pbnxpbv9yy073r8z5jk";
};
beamDeps = [telemetry];
};
connection = buildMix rec {
name = "connection";
version = "1.1.0";
@ -195,12 +182,12 @@
cors_plug = buildMix rec {
name = "cors_plug";
version = "2.0.3";
version = "3.0.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1sls8rns2k48qrga0ngysbn9aknapmn3xfn28by1gqbcir0y2jpf";
sha256 = "03c3vwp4bdk3sixica4mmg0vinmx8qdz2bmbby1x6bi7ijg7ab9z";
};
beamDeps = [plug];
@ -221,12 +208,12 @@
cowboy_telemetry = buildRebar3 rec {
name = "cowboy_telemetry";
version = "0.3.1";
version = "0.4.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1bzhcdq12p837cii2jgvzjyrffiwgm5bsb1pra2an3hkcqrzsvis";
sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x";
};
beamDeps = [cowboy telemetry];
@ -245,6 +232,19 @@
beamDeps = [];
};
credo = buildMix rec {
name = "credo";
version = "1.7.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1mv9lyw6hgjn6hlnzfbs0x2dchvwlmj8bg0a8l7iq38z7pvgqfb8";
};
beamDeps = [bunt file_system jason];
};
custom_base = buildMix rec {
name = "custom_base";
version = "0.2.1";
@ -312,12 +312,12 @@
earmark = buildMix rec {
name = "earmark";
version = "1.4.38";
version = "1.4.39";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0zzcslyv92gcp4zs3rd1vmw844s1q0fv127m7f7pszhnwh6y6f7r";
sha256 = "0h547ri1nbxyaisyx7jddg3wib7fpm3q4v914szwvv6bqf79sv0m";
};
beamDeps = [earmark_parser];
@ -325,12 +325,12 @@
earmark_parser = buildMix rec {
name = "earmark_parser";
version = "1.4.32";
version = "1.4.33";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0md7rhw1ix4fp31bql9scvl4jpijixczm2ky7mxffwq3srvxvc5q";
sha256 = "13qvlqnii8g6bcz6cl330vjwaan7jy30g1app3yvjncvf8rnhlid";
};
beamDeps = [];
@ -351,12 +351,12 @@
ecto = buildMix rec {
name = "ecto";
version = "3.9.5";
version = "3.10.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0k5p40cy6zxi3wm885amf78724zvb5a8chmpljzw1kdsiifi3wyl";
sha256 = "0crlrpl392pbkzl6ar4z6afna8h9d46wshky1zbr3m344d7cggj4";
};
beamDeps = [decimal jason telemetry];
@ -377,12 +377,12 @@
ecto_psql_extras = buildMix rec {
name = "ecto_psql_extras";
version = "0.7.11";
version = "0.7.12";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "08qbsk5njwz48vj4nq7bb6jc1mhjf8ay5fhbr18hvx6lj8gizxny";
sha256 = "0k3iczvfj7m77170falil6h49r4hih1p54m952j37q2cnw81s7aa";
};
beamDeps = [ecto_sql postgrex table_rex];
@ -390,12 +390,12 @@
ecto_sql = buildMix rec {
name = "ecto_sql";
version = "3.9.2";
version = "3.10.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0w1zplm8ndf10dwxffg60iwzvbz3hyyiy761x91cvnwg6nsfxd8y";
sha256 = "0sy5277akp828hvcg60yxhpfgj543y2z1bqy2z414pv9ppdmp8pn";
};
beamDeps = [db_connection ecto postgrex telemetry];
@ -442,15 +442,15 @@
ex_aws = buildMix rec {
name = "ex_aws";
version = "2.1.9";
version = "2.4.4";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "040dmj94xg3wnk9wplm0myr2q12zad4w1xz1zc0n01y90dkpfv1y";
sha256 = "1iqxr74m7wwqbjkrzrm6xs2ri9kshabh1wpk0jw6zcd2bi43xmm7";
};
beamDeps = [hackney jason sweet_xml];
beamDeps = [hackney jason mime sweet_xml telemetry];
};
ex_aws_s3 = buildMix rec {
@ -481,12 +481,12 @@
ex_doc = buildMix rec {
name = "ex_doc";
version = "0.29.4";
version = "0.30.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1xf49d0ni08a83iankdj8fb6jyxm67wjl0gdwihwnimf6ykrjric";
sha256 = "1dhqi5qx2fkphia0g7x2qg6pib08wsbn4dyyg7gmxln18qh71j7v";
};
beamDeps = [earmark_parser makeup_elixir makeup_erlang];
@ -507,38 +507,51 @@
ex_syslogger = buildMix rec {
name = "ex_syslogger";
version = "1.5.2";
version = "2.0.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "16c376cvw0bcjz8a6gs3nhmg037i894gl5kgxi8jdinv6r0sp7xb";
sha256 = "17h1p3l3a3icqlkyxglw4wwqxxhjb1indas9s7nfdsb42zkjyax5";
};
beamDeps = [poison syslog];
beamDeps = [jason syslog];
};
excoveralls = buildMix rec {
name = "excoveralls";
version = "0.15.1";
version = "0.16.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1rq7vqvzw7sa2r7n59bhbxbhcnjr6z44dkvq45mdb0h01kcnnhgq";
sha256 = "0f7i5gx1rpswbqmmqv133v3lpjwpkhjb2k56fmqcy210ir367rys";
};
beamDeps = [hackney jason];
};
fast_html = buildMix rec {
name = "fast_html";
version = "2.0.5";
expo = buildMix rec {
name = "expo";
version = "0.4.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "01k51qri44535b1hwixlxk7151vph6vapswlfq918g245544ypv0";
sha256 = "0iyfl4vppfhmimfqaracjza9a6y8rgia03sm28y5934cg5xbmxrg";
};
beamDeps = [];
};
fast_html = buildMix rec {
name = "fast_html";
version = "2.2.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1bpvmqw4pcx8ssgmazvqn0dm6b3g0m5rij6shy8qy5m6nhilyk06";
};
beamDeps = [elixir_make nimble_pool];
@ -572,12 +585,12 @@
finch = buildMix rec {
name = "finch";
version = "0.14.0";
version = "0.16.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1pd805jyd4qbpb2md3kw443325yqynpkpyr2iixb9zf432psqnal";
sha256 = "1iayffbjzb1rcy1p0wibzv6j5n7dc16ha5lhcbn5z7ji9m61fq7n";
};
beamDeps = [castore mime mint nimble_options nimble_pool telemetry];
@ -598,12 +611,12 @@
floki = buildMix rec {
name = "floki";
version = "0.34.2";
version = "0.34.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1j6ilik6pviff34rrqr8456h7pp0qlash731pv36ny811w7xbf96";
sha256 = "0h936kfai562dh4qpcpri7jxrdmqyxaymizk9d5r55svx8748xwm";
};
beamDeps = [];
@ -611,28 +624,28 @@
gen_smtp = buildRebar3 rec {
name = "gen_smtp";
version = "0.15.0";
version = "1.2.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "03s40l97j6z4mx6a84cbl9w94v3dvfw4f97dqx4hi61hh2l19g99";
sha256 = "0yb7541zx0x76gzk0m1m8fkl6524jhl8rxc59l6g5a5wh1b3gq2y";
};
beamDeps = [];
beamDeps = [ranch];
};
gettext = buildMix rec {
name = "gettext";
version = "0.20.0";
version = "0.22.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0ggb458h60ch3inndqp9xhbailhb0jkq3xnp85sa94sy8dvv20qw";
sha256 = "1gb49f75apkgfa5ddg02x08w1i3qm31jifzicrl4m58kfx226pwk";
};
beamDeps = [];
beamDeps = [expo];
};
hackney = buildRebar3 rec {
@ -728,12 +741,12 @@
jason = buildMix rec {
name = "jason";
version = "1.4.0";
version = "1.4.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0891p2yrg3ri04p302cxfww3fi16pvvw1kh4r91zg85jhl87k8vr";
sha256 = "18d70i31bz11nr6vgsjn5prvhkvwqbyf3xq22ck5cnsnzp6ixc7v";
};
beamDeps = [decimal];
@ -754,12 +767,12 @@
jose = buildMix rec {
name = "jose";
version = "1.11.5";
version = "1.11.6";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "115k981kfg9jmafgs16rybc5qah6p0zgvni3bdyfl0pyp8av5lyw";
sha256 = "0f4pzx8xdzjkkfjkl442w6lhajgfzsnp3dxcxrh1x72ga1swnxb2";
};
beamDeps = [];
@ -780,12 +793,12 @@
mail = buildMix rec {
name = "mail";
version = "0.2.3";
version = "0.3.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1xbbdkyar8h0pdihfnsd84j1w3vfh9sk3xkz1llxz7y6m67kjawk";
sha256 = "0v0i0xwhsqvdxxyacmcf25pqyda87yqkn7g49vf8gn1i485p0gaj";
};
beamDeps = [];
@ -832,12 +845,12 @@
makeup_erlang = buildMix rec {
name = "makeup_erlang";
version = "0.1.1";
version = "0.1.2";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1fvw0zr7vqd94vlj62xbqh0yrih1f7wwnmlj62rz0klax44hhk8p";
sha256 = "02411riqa713wzw8in582yva6n6spi4w1ndnj8nhjvnfjg5a3xgk";
};
beamDeps = [makeup];
@ -910,12 +923,12 @@
mock = buildMix rec {
name = "mock";
version = "0.3.7";
version = "0.3.8";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0p3yrx049fdw88kjidngd2lkwqkkyck5r51ng2dxj7z41539m92d";
sha256 = "08i0zvk3wss217pjr4qczmdgxi607wcp2mfinydxf5vnr5j27a3z";
};
beamDeps = [meck];
@ -923,12 +936,12 @@
mogrify = buildMix rec {
name = "mogrify";
version = "0.9.2";
version = "0.9.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "17b9dy40rq3rwn7crjggjafibxz4ys4nqq81adcf486af3yi13f1";
sha256 = "1rii2yjswnbivmdfnxljvqw3vlpgkhiqikz8k8mmyi97vvhv3281";
};
beamDeps = [];
@ -949,12 +962,12 @@
nimble_options = buildMix rec {
name = "nimble_options";
version = "0.5.2";
version = "1.0.2";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1q6wa2ljprybfb9w2zg0gbppiwsnimgw5kcvakdp3z8mp42gk9sd";
sha256 = "1f7ih1rnkvph0daf4lsv4rrp6dpccksjd7rh5bhnq0r143dsh4px";
};
beamDeps = [];
@ -988,12 +1001,12 @@
oban = buildMix rec {
name = "oban";
version = "2.12.1";
version = "2.15.2";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0n6h8a6v9hzk6s5dhadfbrvwnx2nkl64n575ff5ph3afnz14864v";
sha256 = "1sgickk10b73pkddfhk5vhmi8vjn065wzyl41ng4iiwgljg5fjhg";
};
beamDeps = [ecto_sql jason postgrex telemetry];
@ -1001,12 +1014,12 @@
open_api_spex = buildMix rec {
name = "open_api_spex";
version = "3.16.3";
version = "3.17.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1bgcp0sfj9j95nb353dn66m81085sq5pwdzwq80x1xc8mgpydjqv";
sha256 = "1zphp59dd3l4l8279pjmhbddskimbgrr123wivycz0yahldb4p8n";
};
beamDeps = [jason plug poison];
@ -1040,12 +1053,12 @@
phoenix_ecto = buildMix rec {
name = "phoenix_ecto";
version = "4.4.0";
version = "4.4.2";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1h9wnjmxns8y8dsr0r41ks66gscaqm7ivk4gsh5y07nkiralx1h9";
sha256 = "0pcgrvj5lqjmsngrhl77kv0l8ik8gg7pw19v4xlhpm818vfjw93h";
};
beamDeps = [ecto phoenix_html plug];
@ -1092,12 +1105,12 @@
phoenix_pubsub = buildMix rec {
name = "phoenix_pubsub";
version = "2.1.1";
version = "2.1.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1nfqrmbrq45if9pgk6g6vqiply2sxc40is3bfanphn7a3rnpqdl1";
sha256 = "00p5dvizhawhqbia2cakdn4whaxsm2adq3lzfn3b137xvk0np85v";
};
beamDeps = [];
@ -1105,25 +1118,25 @@
phoenix_swoosh = buildMix rec {
name = "phoenix_swoosh";
version = "0.3.4";
version = "1.2.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "072pa2rnzkvw645f3jh15rmgsnzccbyqjx1wbsmj28138qc24w9r";
sha256 = "1fhxh4sff7b3qz2lyryzgms9d6mrhxnmlh924awid6p8a5r133g8";
};
beamDeps = [hackney phoenix phoenix_html swoosh];
beamDeps = [finch hackney phoenix phoenix_html phoenix_view swoosh];
};
phoenix_template = buildMix rec {
name = "phoenix_template";
version = "1.0.1";
version = "1.0.3";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1vlkd4z2bxinczwcysydidpnh49rpxjihb5k3k4k8qr2yrwc0z8m";
sha256 = "0b4fbp9dhfii6njksm35z8xf4bp8lw5hr7bv0p6g6lj1i9cbdx0n";
};
beamDeps = [phoenix_html];
@ -1222,15 +1235,15 @@
postgrex = buildMix rec {
name = "postgrex";
version = "0.16.5";
version = "0.17.2";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1s5jbwfzsdsyvlwgx3bqlfwilj2c468wi3qxq0c2d23fvhwxdspd";
sha256 = "036r3q250vrhj4nmyr4cc40krjgbyci18qkhppvkj7akx6liiac0";
};
beamDeps = [connection db_connection decimal jason];
beamDeps = [db_connection decimal jason];
};
pot = buildRebar3 rec {
@ -1300,12 +1313,12 @@
ssl_verify_fun = buildRebar3 rec {
name = "ssl_verify_fun";
version = "1.1.6";
version = "1.1.7";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x";
sha256 = "1y37pj5q6gk1vrnwg1vraws9yihrv9g4133w2qq1sh1piw71jk7y";
};
beamDeps = [];
@ -1339,12 +1352,12 @@
swoosh = buildMix rec {
name = "swoosh";
version = "1.10.2";
version = "1.11.4";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0fm0vp0azzrbs53r967x5dgqrj3879dzvka5304wcjgdfkrzldhp";
sha256 = "03rxj2jdrjg6pab05iz8myr0j9fi3d1v7z2bc3hnli9a08a0jffk";
};
beamDeps = [cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry];
@ -1378,12 +1391,12 @@
telemetry = buildRebar3 rec {
name = "telemetry";
version = "0.4.3";
version = "1.2.1";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0hc0fr2bh97wah9ycpm7hb5jdqr5hnl1s3b2ibbbx9gxbwvbhwpb";
sha256 = "1mgyx9zw92g6w8fp9pblm3b0bghwxwwcbslrixq23ipzisfwxnfs";
};
beamDeps = [];
@ -1430,12 +1443,12 @@
telemetry_poller = buildRebar3 rec {
name = "telemetry_poller";
version = "0.5.1";
version = "1.0.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "1m1zcq65yz0wp1wx7mcy2iq37cyizbzrmv0c11x6xg0hj8375asc";
sha256 = "0vjgxkxn9ll1gc6xd8jh4b0ldmg9l7fsfg7w63d44gvcssplx8mk";
};
beamDeps = [telemetry];
@ -1443,12 +1456,12 @@
tesla = buildMix rec {
name = "tesla";
version = "1.4.4";
version = "1.7.0";
src = fetchHex {
pkg = "${name}";
version = "${version}";
sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m";
sha256 = "04y31nq54j1wnzpi37779bzzq0sjwsh53ikvnh4n40nvpwgg0r1f";
};
beamDeps = [castore finch hackney jason mime mint poison telemetry];

View file

@ -1,11 +0,0 @@
{
"url": "https://akkoma.dev/AkkomaGang/pleroma-fe.git",
"rev": "af97dd7484facb0f32d30ca9a4210831295a758d",
"date": "2023-07-21T19:44:25+00:00",
"path": "/nix/store/cygji92vvgykvzp0ibd783iqzm4j47jp-pleroma-fe",
"sha256": "1kb5m2fkf0kac8mscgl8li54hzzkmsw760xw58gmqlacjk5v64l2",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

View file

@ -1,9 +1,10 @@
{
"url": "https://akkoma.dev/AkkomaGang/akkoma.git",
"rev": "801fe9fe32f3c7bc6ffdabfb8a18827f18309a0c",
"date": "2023-07-27T14:41:18+01:00",
"path": "/nix/store/cz4kp1mm6bk7d00spzal8s5q4gl3z31a-akkoma",
"sha256": "1rj1v9hsym84xbbb5k43l9wjjkpxjc345ym288kk6jiic5vv4vc3",
"rev": "59af68c60014e87cbd46c5aa798065adfeb6c8f0",
"date": "2023-08-05T14:11:27+01:00",
"path": "/nix/store/idk900v8jhrdimpinc9filn5xamps3hs-akkoma",
"sha256": "05fir3whsjksgcg5dmz99riic877fwm274g71hw99bzypab9a7aj",
"hash": "sha256-Uh2Vlrr+r5Q4DOeRIyp35yAWY07p11Yee3pKDfnI0RU=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -4,6 +4,7 @@
"date": "2022-04-01T14:18:07+02:00",
"path": "/nix/store/g7cq22k0q1fhv6jajzmy2k0sl1xmz7n5-CarolineStickers",
"sha256": "14wgn1jdp698anbkgilf6x90vgkwgls4c17jaa9qqs3fxrj44ij3",
"hash": "sha256-Q0ZCZO5uaIyTUvIERjR9fL4NUjeOxjeXVSiZ22Swj5M=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -14,7 +14,7 @@ in
version = srcInfo.date;
passthru.updateScript = [
../../scripts/update-git.sh
"https://git.chir.rs/darkkirb/lotte-art"
"https://github.com/DarkKirb/lotte-art"
"art/lotte/source.json"
"--fetch-lfs"
];

View file

@ -1,9 +1,10 @@
{
"url": "https://git.chir.rs/darkkirb/lotte-art",
"url": "https://github.com/DarkKirb/lotte-art",
"rev": "7f83e0ac5d88bb1db6596b4a44220d21e42015c8",
"date": "2023-06-03T09:00:35+01:00",
"path": "/nix/store/cs4hlb6svkfmxc6hbhf2rz6bhr1pmsv9-lotte-art",
"sha256": "1ffz1agshp7gxpxyabdjlyffrmdi1p5bafi0vm9np1js6ml7yq11",
"hash": "sha256-IWB/aDVahmtT3SA6tcoNsdXsnKeyLeX77e9cqJ8K37k=",
"fetchLFS": true,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -4,6 +4,7 @@
"date": "2023-07-18T09:27:42+02:00",
"path": "/nix/store/jdydjx2am9rd2m584x6db98h4daww40j-asar",
"sha256": "00rk52mba49ixpgy6dcinln473pa9326xk9s0rc6ck7ck9wc2a3f",
"hash": "sha256-bijBeJrsTGZYBjrNbsRI6o5DLLWRNePf7TERtaooMwM=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -18,7 +18,7 @@ in
inherit
(pkgsWithOverlay)
akkoma
pleroma-fe
akkoma-fe
admin-fe
emoji-lotte
emoji-volpeon-blobfox

View file

@ -4,6 +4,7 @@
"date": "2023-06-05T20:56:09-04:00",
"path": "/nix/store/pn7q6xy2hpd57s2a29j4zp3lk06sf462-bsnes-plus",
"sha256": "0g7djccmshidqjcpgm0w8mvi4wy1w2v3zfvl1sv5caarch6kdswv",
"hash": "sha256-m+s2DWRZKVa2DnS7P7bgwXMSd0Uc1HeZxC1CXRmT7Tw=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -259,11 +259,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1690952720,
"narHash": "sha256-fPsiQHARfhVxXpWgcuSKvkYwSco8K13K7XevBpdIfPg=",
"lastModified": 1691237572,
"narHash": "sha256-aOYQEPbPEj39TauLhvPoj2gklOPfUo/hDXBhB03xccI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "96112a3ed5d12bb1758b42c63b924c004b6c0bc9",
"rev": "404abaa27acc261d654bd8ec384641200feb8e2a",
"type": "github"
},
"original": {

View file

@ -62,7 +62,7 @@
inherit
(pkgs)
akkoma
pleroma-fe
akkoma-fe
admin-fe
emoji-lotte
emoji-volpeon-blobfox

View file

@ -4,6 +4,7 @@
"date": "2022-10-20T06:08:47-07:00",
"path": "/nix/store/2kbzlxqxpyrr3mqwfyn4mk2qc6hjb7v8-open-relay",
"sha256": "02w7i6mrf5rdi9ksymykrcf0giyzrhrd68h1ncxhkvgg8cc7rkj6",
"hash": "sha256-Rs58GEPv7Qk7swEi0zLM38cHHMvTV69nii0Xl6uJhws=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -4,6 +4,7 @@
"date": "2023-05-16T17:48:51-07:00",
"path": "/nix/store/m2gzmhr0lm3wjyjhagm8kf2li6drydwv-nasin-nanpa",
"sha256": "1fflz5708l2sv4fq8k7z556kbqf0x1qh6scjckm0ws9g9w4y8ppj",
"hash": "sha256-8l7kCU8vaQ7qZJJpA3HowOE1TSn/TIQd2VpQBE751Lk=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.11.35",
"version": "1.11.38",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -70,7 +70,7 @@
},
"dependencies": {
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
"@matrix-org/react-sdk-module-api": "^0.0.5",
"@matrix-org/react-sdk-module-api": "^1.0.0",
"gfm.css": "^1.1.2",
"jsrsasign": "^10.5.25",
"katex": "^0.16.0",
@ -79,7 +79,6 @@
"matrix-widget-api": "^1.3.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"sanitize-html": "^2.3.2",
"ua-parser-js": "^1.0.0"
},
"devDependencies": {
@ -88,6 +87,7 @@
"@babel/eslint-plugin": "^7.12.10",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-proposal-export-default-from": "^7.12.1",
"@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
"@babel/plugin-proposal-numeric-separator": "^7.12.7",
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
@ -111,7 +111,6 @@
"@types/node": "^16",
"@types/react": "17.0.58",
"@types/react-dom": "17.0.19",
"@types/sanitize-html": "^2.3.1",
"@types/ua-parser-js": "^0.7.36",
"@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0",
@ -123,7 +122,7 @@
"cpx": "^1.5.0",
"css-loader": "^4",
"dotenv": "^16.0.2",
"eslint": "8.43.0",
"eslint": "8.45.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-deprecate": "^0.7.0",
@ -131,7 +130,7 @@
"eslint-plugin-matrix-org": "^1.0.0",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-unicorn": "^47.0.0",
"eslint-plugin-unicorn": "^48.0.0",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"fake-indexeddb": "^4.0.0",
"fetch-mock-jest": "^1.5.1",
@ -139,7 +138,7 @@
"fs-extra": "^11.0.0",
"html-webpack-plugin": "^4.5.2",
"jest": "^29.0.0",
"jest-canvas-mock": "2.5.1",
"jest-canvas-mock": "2.5.2",
"jest-environment-jsdom": "^29.0.0",
"jest-mock": "^29.0.0",
"jest-raw-loader": "^1.0.1",
@ -170,13 +169,13 @@
"simple-proxy-agent": "^1.1.0",
"string-replace-loader": "3",
"style-loader": "2",
"stylelint": "^15.3.0",
"stylelint-config-standard": "^33.0.0",
"stylelint": "^15.10.1",
"stylelint-config-standard": "^34.0.0",
"stylelint-scss": "^5.0.0",
"terser-webpack-plugin": "^4.0.0",
"ts-node": "^10.9.1",
"ts-prune": "^0.10.3",
"typescript": "5.0.4",
"typescript": "5.1.6",
"webpack": "^4.46.0",
"webpack-bundle-analyzer": "^4.8.0",
"webpack-cli": "^3.3.12",

View file

@ -1,9 +1,10 @@
{
"url": "https://github.com/maunium/element-web",
"rev": "007fa59ff2ffe15d3253a5f4687950be1de3f9b9",
"date": "2023-07-05T00:06:21+03:00",
"path": "/nix/store/v8ra0sv9bwk88714rqfjhwps2v0q0piq-element-web",
"sha256": "0jhzs5zvby95bsj341w8carvxg5946vazmspjjyn4brhc8ynqjdy",
"rev": "c80fb62edf9f03431e9d06b6e1612db15f99f984",
"date": "2023-08-04T19:11:11+03:00",
"path": "/nix/store/3qsbrhlqnlcagmzki9yh72255d5faxdf-element-web",
"sha256": "06hdc826qg959y56z2zb3bhpkw5s52q8xfh55r8y4lbcw0r85gv2",
"hash": "sha256-Yr+CMuBsUeJRLgW6jrAouvB54Rrri2+KTyU9bARiDRo=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -2,8 +2,8 @@ schema = 3
[mod]
[mod."github.com/bwmarrin/discordgo"]
version = "v0.0.0-20230620222529-2cb9d9280e37"
hash = "sha256-GXKZ9SZmCQFXRsh2AOrt42K3zOzRJ7K4gJQYa8SDlsU="
version = "v0.0.0-20230804154054-72abb5417718"
hash = "sha256-fPK0cEOwEyEzfPwpBkXXuTAQVeMIqogHn2qWaWHg05g="
replaced = "github.com/beeper/discordgo"
[mod."github.com/coreos/go-systemd/v22"]
version = "v22.5.0"

View file

@ -1,9 +1,10 @@
{
"url": "https://github.com/mautrix/discord",
"rev": "5467ab074df10b4c10ef693e804b7fedcb5f84a4",
"date": "2023-07-29T14:43:44+03:00",
"path": "/nix/store/gk3jnazz8k5sskqmga1al7b329zascls-discord",
"sha256": "12lj41jazpf4dagcbk5vvrs3hmph0b7z4xa2csw3p7ks3nl22lnx",
"rev": "2ec3b0ebce89604c0fdf494bdd2cbfc4a9697a3d",
"date": "2023-08-04T18:42:02+03:00",
"path": "/nix/store/j9h8nldxrvyjb4cbkk565r477sgpphrw-discord",
"sha256": "0m81khgcl68895hqk65nqk108v5n2fw8vf6c7g6npzshprv2yc69",
"hash": "sha256-yTAvdr5Q/2vNO8y4jbgTtmwEwsS2mIlhSQgZyh6cAVU=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -4,6 +4,7 @@
"date": "2023-05-17T16:52:17+03:00",
"path": "/nix/store/2mxgl4ksnc6aa5q8mddkjgl5x2v7f5bw-signal",
"sha256": "13sz1b1ssm9fc21vspn51x8yh6wb3wjbr90isq7ifng206xp4a21",
"hash": "sha256-QShyuwHiWRcP1hGkvCQfixvoUQ/FXr2DYC5VrcMKX48=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,10 @@
{
"url": "https://github.com/mautrix/telegram",
"rev": "23ec691128d30545c208c06eb4805443e292eb23",
"date": "2023-07-21T12:33:28+03:00",
"path": "/nix/store/x4cwvs0f02lq51k69741ck1q3p09zi6b-telegram",
"sha256": "17ng30px8413a3il8rf640w3y69ij3y3imnd7hiqq5yrz0959k05",
"rev": "f79ab283f3dca1a6d6f17d87c137a229e1f5718e",
"date": "2023-08-03T20:37:01+03:00",
"path": "/nix/store/npfz23j8mjx7ci4f7r64zijx5qhr0nwy-telegram",
"sha256": "0xcwbknkifylqgvpkp0cwsjwqq4fspy39j13bqgc9845c2askpcg",
"hash": "sha256-j92plWCFoMQeXiPINPzVjmDMpeYM3Hn3w9S7OO1cnHU=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -83,8 +83,8 @@ schema = 3
version = "v0.1.0"
hash = "sha256-hSZQkw/0eV5Y0pj1N+idYuKb/jtiw/qTfaOGdYCXmn0="
[mod."go.mau.fi/whatsmeow"]
version = "v0.0.0-20230718190209-efef6f1cec8e"
hash = "sha256-fKlhznh4vhIAw+cksa4SNNvGFifiLeJcGZ104KyMUu8="
version = "v0.0.0-20230804210635-04e4e3a38f73"
hash = "sha256-+OOUcYkdAEGXW0Lg46T3UF1mI7ZA2JblSYOSgxw3fLg="
[mod."go.mau.fi/zeroconfig"]
version = "v0.1.2"
hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w="
@ -122,5 +122,5 @@ schema = 3
version = "v2.4.1"
hash = "sha256-OstOCC7Bib6mbcUG2X3YafEBikFhPQ8lN6jPK5c/Ah8="
[mod."maunium.net/go/mautrix"]
version = "v0.15.5-0.20230728182848-1ef656165098"
hash = "sha256-tZ4tI+dCm4nNCAA2421UgvY/DMbXrNRR9jimAwtQbPs="
version = "v0.15.5-0.20230729114956-ff77fa8ec663"
hash = "sha256-0l6mwdyOIwOlyXJ4XEUFJPUSpjZF9dOVHl3ZnIERYL4="

View file

@ -1,9 +1,10 @@
{
"url": "https://github.com/mautrix/whatsapp",
"rev": "d19ae64ccacda05a058a1ff46e3149c9b22ee853",
"date": "2023-07-28T22:19:56+03:00",
"path": "/nix/store/hg4lvfr425zjnvszzivqzf82aspcn9aa-whatsapp",
"sha256": "1zkv12r3wwwn2hpm48a97wgi91wbfkfl29j4f4ix8wc7737cw50a",
"rev": "e07ed17ccdff16000064c98c4e2b83f9fe757cfa",
"date": "2023-08-05T00:07:16+03:00",
"path": "/nix/store/izdmkhai1k3pc38cbbibvcbkgh49im6w-whatsapp",
"sha256": "1jp5aba8m78dlgqvazbwaw9irpskcz4bjn7i6kc3g6plc7ygc12z",
"hash": "sha256-XwT2/GH0mjfYNPFYuchnU98cE1d8fbXxow2ditRS5co=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,6 +1,6 @@
{
"version": "1.20.1",
"build": 100,
"name": "paper-1.20.1-100.jar",
"sha256": "eeef008b654aa1cdc0f83ffaa61a1546d01ac5a35051fa92b0684a39da18c217"
"build": 102,
"name": "paper-1.20.1-102.jar",
"sha256": "b3d64110042dc36f33f41c27b67c1467afeca2398139baeb4b569b69af6afa72"
}

View file

@ -57,7 +57,7 @@ system: self: super: let
(getFlakeOverlay "gomod2nix" "default")
(self: super: {
akkoma = self.callPackage ./akkoma {};
pleroma-fe = self.callPackage ./akkoma/pleroma-fe {};
akkoma-fe = self.callPackage ./akkoma/akkoma-fe {};
admin-fe = self.callPackage ./akkoma/admin-fe {};
emoji-lotte = self.callPackage ./art/emoji/lotte {};
emoji-volpeon-blobfox = self.callPackage ./art/emoji/volpeon/blobfox.nix {};

View file

@ -4,6 +4,7 @@
"date": "2023-07-26T09:43:54+10:00",
"path": "/nix/store/n7vj3yhkjh98wd499jr3ndm3v7afjccn-steno-dictionaries",
"sha256": "12fx1h3maaf5f1y6qh1grbn5bvqjzyjgvnyjwsipn1zvpixrhki5",
"hash": "sha256-JU6Ye7z7B3uj5tLb/aT/Eu9V7MovQGx8cMUpVQcM3Yk=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -4,6 +4,7 @@
"date": "2022-12-28T16:27:53+01:00",
"path": "/nix/store/m8rzky40wb4cmlpjj7hlrkycp22fk7lz-plover-machine-hid",
"sha256": "1894jhazyznql30rgmgasx526f7khh8kckgpcj52y5kfq8vaqbq1",
"hash": "sha256-AS+sNsJuFi+KZPdNNhGE8zgjStfq1ZfBoNh+/xWUJKE=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -4,6 +4,7 @@
"date": "2023-01-04T12:02:31+01:00",
"path": "/nix/store/qykphr5ny4a34nakm1rif0hbqn0irni7-plover-machine-hid",
"sha256": "01m1i9wg8hbzxxcllqq5mr0nf7v0ks44v20glxnvnicqwcmsdd7m",
"hash": "sha256-9bSmK+OYRbttpw+ITYieYB9nQa4FY0pZ739B9HiKoQY=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -4,6 +4,7 @@
"date": "2023-07-14T15:07:28-07:00",
"path": "/nix/store/883lqfmw3ds3q3x30kjq1mcwbvv4q793-plover",
"sha256": "18201lrr2pcd2y8109m87rw0a04bkkrmy87glvmzgmj0yn4l3wwc",
"hash": "sha256-jPNBifVA1vfrpu8gX/OciwAFeD6oJhCQF41dkTMNQKA=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -4,6 +4,7 @@
"date": "2019-11-13T09:46:29-08:00",
"path": "/nix/store/6kvrivy42gkxznbm3j9ari0qlbzx1siv-python-instagram",
"sha256": "1azjndl45khgx79bwbkk45clzb2fcb7dbl4j77wv1pgs4xxc3gry",
"hash": "sha256-Pr/Beif63bD5OZLQ1c5iTqxPWSFzLr7S6Q/OQmiz8qs=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -4,6 +4,7 @@
"date": "2023-05-31T20:09:40+02:00",
"path": "/nix/store/qcqc0pbzg1brymy7a6i64rdc4yqdd4w0-MiiFox.net",
"sha256": "1kgf4lzz8di10d2l6ihi2qy05lzvpvrvjp4ykfmw5bh7nfgbg0cl",
"hash": "sha256-lIG3nrMHrsKrm55cufO++9MCPBYRRkNFAyE29D8l7s0=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,