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.

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

akkoma: 3.11.0 -> 3.12.1 #300343

Merged
merged 3 commits into from
Apr 12, 2024
Merged

akkoma: 3.11.0 -> 3.12.1 #300343

merged 3 commits into from
Apr 12, 2024

Conversation

tcmal
Copy link
Member

@tcmal tcmal commented Mar 30, 2024

Description of changes

Update akkoma to 3.12.1 (aka 2024.03). Changelog here.
This is a security update, therefore this should probably be cherry picked to 23.11.

This update introduces the requirement for users to configure Pleroma.Upload.base_url explicitly (along with the media proxy base URL if needed).
Since uploads are essential functionality for most people, this patch also adds a requirement for this field to be filled out when using the NixOS module.
Technically this is breaking, so I'm not certain how this should be done.

I also added myself as a maintainer, since I already maintain an akkoma server running on Nix, and am happy to upstream my changes.
Happy to undo this if it's not wanted.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@Mynacol
Copy link
Contributor

Mynacol commented Mar 31, 2024

Also interested in a backport to 23.11, but also unsure how to do it. Anyways pinging the existing maintainer @illdefined.

Maybe for the backport set the default value of the two new required parameters to the previous default values (roughly Pleroma.Upload.base_url = mkDefault "${Pleroma.Web.Endpoint.url}/media/" and ":media_proxy.base_url = mkDefault Pleroma.Web.Endpoint.url).

And for unstable make them required or emit a warning, but set them to the above defaults.

The ofborg check can be fixed by changing the license back from agpl3 to agpl3Only.

@Mynacol Mynacol added the 9.needs: port to stable A PR needs a backport to the stable release. label Mar 31, 2024
pkgs/servers/akkoma/default.nix Show resolved Hide resolved
pkgs/servers/akkoma/default.nix Outdated Show resolved Hide resolved
@illdefined
Copy link
Contributor

I just noticed that there is a 3.12.2 release already. May I suggest we skip 3.12.1?

@tcmal
Copy link
Member Author

tcmal commented Apr 4, 2024

Have (I think) set them to a default for versions up to 23.05, and required past that.

Copy link
Contributor

@illdefined illdefined left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes to the package and module look good to me, but there is a small error in the addition to the maintainer list.

Copy link
Contributor

@LeSuisse LeSuisse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nixosTests.akkoma and nixosTests.akkoma-confined seem to be failing

@illdefined
Copy link
Contributor

illdefined commented Apr 8, 2024

@tcmal It looks like you omitted your earlier changes to the module test from the PR, which means that the upload base URL is no longer being set: https://github.com/NixOS/nixpkgs/compare/eb01e4856cdf2212ef95c89a00f39ed969e5bd9b..5116d02ba03cdc8b0d033cb7b1825b5a7fb5d190#diff-9a3a1a75457221f8bb90ae13db288c63d6b452bb58e332abc52203504372f70d

@tcmal
Copy link
Member Author

tcmal commented Apr 9, 2024

My bad.

new versions of akkoma require the upload base url to be specified in
order for updates to work properly.
this will be a breaking change in 24.05, but for now a reasonable
default is set.
Copy link
Contributor

@illdefined illdefined left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully ran the module tests locally.

LeSuisse

This comment was marked as duplicate.

Copy link
Contributor

@LeSuisse LeSuisse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like nixosTests.akkoma-confined is still broken (nixosTests.akkoma succeeds now)

@illdefined
Copy link
Contributor

illdefined commented Apr 11, 2024

It looks like nixosTests.akkoma-confined is still broken (nixosTests.akkoma succeeds now)

The tests both passed successfully on my local machine (Linux x86-64, commit ID f8b9215e).

If I run the confined test repeatedly, it consistently fails the first time but succeeds on the second try.

Copy link
Contributor

@LeSuisse LeSuisse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed the test seems to be a bit flaky but it's also the case on master so let's merge.

@LeSuisse LeSuisse merged commit 8aa99de into NixOS:master Apr 12, 2024
26 of 27 checks passed
Copy link
Contributor

Backport failed for release-23.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.11
git worktree add -d .worktree/backport-300343-to-release-23.11 origin/release-23.11
cd .worktree/backport-300343-to-release-23.11
git switch --create backport-300343-to-release-23.11
git cherry-pick -x 855667eadc206242c1bfe5e379243193dceca1f2 d598b5d88da2fc8cfaa839a05986dd5990acd043 f8b9215e9fe939497143ba2cfc9ad0ab8e26a6d8

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants