Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

akkoma: 3.9.3 → 3.10.4 #251987

Merged
merged 3 commits into from
Sep 6, 2023
Merged

akkoma: 3.9.3 → 3.10.4 #251987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd1ca36
akkoma: 3.9.3 -> 3.10.4
illdefined Aug 8, 2023
f278395
akkoma-fe: 2023-05-23 -> 2023-08-05
illdefined Aug 8, 2023
b56f814
nixos/tests/akkoma: Disable retrieving timeline
illdefined Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion nixos/tests/akkoma.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ let

echo '${userPassword}' | ${pkgs.toot}/bin/toot login_cli -i "akkoma.nixos.test" -e "jamy@nixos.test"
echo "y" | ${pkgs.toot}/bin/toot post "hello world Jamy here"
echo "y" | ${pkgs.toot}/bin/toot timeline | grep -F -q "hello world Jamy here"

# Retrieving timeline with toot currently broken due to incompatible timestamp format
# cf. <https://akkoma.dev/AkkomaGang/akkoma/issues/637> and <https://github.com/ihabunek/toot/issues/399>
#echo "y" | ${pkgs.toot}/bin/toot timeline | grep -F -q "hello world Jamy here"

# Test file upload
echo "y" | ${pkgs.toot}/bin/toot upload <(dd if=/dev/zero bs=1024 count=1024 status=none) \
Expand Down
6 changes: 3 additions & 3 deletions pkgs/servers/akkoma/akkoma-fe/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

stdenv.mkDerivation rec {
pname = "akkoma-fe";
version = "unstable-2023-05-23";
version = "unstable-2023-08-05";

src = fetchFromGitea {
domain = "akkoma.dev";
owner = "AkkomaGang";
repo = "akkoma-fe";
rev = "e530c2b4626fab3bc94736cb7d0774809717911f";
hash = "sha256-dowo4YzlkfuQv1G4NclPrKyBwtOq7bEXruQY/BVjNyM=";
rev = "e7a558a533dd31de174791f130afdaa5b6893b74";
hash = "sha256-BRmfppsC7NjDdcLxQHuLbQZmYGkj4DFPRtQOf/pRCpI=";
};

offlineCache = fetchYarnDeps {
Expand Down
25 changes: 13 additions & 12 deletions pkgs/servers/akkoma/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

beamPackages.mixRelease rec {
pname = "pleroma";
version = "3.9.3";
version = "3.10.4";

src = fetchFromGitea {
domain = "akkoma.dev";
owner = "AkkomaGang";
repo = "akkoma";
rev = "v${version}";
hash = "sha256-vXE7jv1GPAMKpWEAE9IUgWo7A+zkGYUzu0jlZ9oSbjA=";
hash = "sha256-MPUZFcIxZ21fe3edwi+/Kt8qpwNBCh40wheC3QMqw2M=";
};

postPatch = ''
Expand Down Expand Up @@ -45,19 +45,20 @@ beamPackages.mixRelease rec {
group = "pleroma";
owner = "elixir-libraries";
repo = "elixir-captcha";
rev = "e0f16822d578866e186a0974d65ad58cddc1e2ab";
sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c";
rev = "3bbfa8b5ea13accc1b1c40579a380d8e5cfd6ad2";
hash = "sha256-skZ0QwF46lUTfsgACMR0AR5ymY2F50BQy1AUBjWVdro=";
};
};
credo = beamPackages.buildMix rec {
name = "credo";
version = "1.7.0-dev";
concurrent_limiter = beamPackages.buildMix rec {
name = "concurrent_limiter";
version = "0.1.1";

src = fetchFromGitHub {
owner = "rrrene";
repo = "credo";
rev = "1c1b99ea41a457761383d81aaf6a606913996fe7";
hash = "sha256-NdOg6p2J1D8VGGWabAMLs/qRVbi4BzN2DTHci++dJnA=";
src = fetchFromGitea {
domain = "akkoma.dev";
owner = "AkkomaGang";
repo = "concurrent-limiter";
rev = "a9e0b3d64574bdba761f429bb4fba0cf687b3338";
hash = "sha256-A7ucZnXks4K+JDVY5vV2cT5KfEOUOo/OHO4rga5mGys=";
};
};
elasticsearch = beamPackages.buildMix rec {
Expand Down
Loading