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

mastodon: 4.1.2 -> 4.1.3 #241924

Merged
merged 1 commit into from
Jul 6, 2023
Merged

Conversation

999eagle
Copy link
Contributor

@999eagle 999eagle commented Jul 6, 2023

Description of changes

https://github.com/mastodon/mastodon/releases/tag/v4.1.3

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.05 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.

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

diff LGTM

Copy link
Member

@e1mo e1mo left a comment

Choose a reason for hiding this comment

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

Diff looks good so far, just waiting for the test to run (let's see if ofborg or my computer will do so sooner)

@erictapen erictapen mentioned this pull request Jul 6, 2023
12 tasks
@leona-ya
Copy link
Member

leona-ya commented Jul 6, 2023

NixOS tests ran successful here

@erictapen erictapen merged commit 0305eac into NixOS:master Jul 6, 2023
5 of 6 checks passed
@github-actions
Copy link
Contributor

github-actions bot commented Jul 6, 2023

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

Please cherry-pick the changes locally.

git fetch origin release-23.05
git worktree add -d .worktree/backport-241924-to-release-23.05 origin/release-23.05
cd .worktree/backport-241924-to-release-23.05
git checkout -b backport-241924-to-release-23.05
ancref=$(git merge-base 6a66e7b3648f5478535f1ad03eb68ee7cf7c11b0 db15bc807130925688f0c2c3b78fddabf3a8a9bd)
git cherry-pick -x $ancref..db15bc807130925688f0c2c3b78fddabf3a8a9bd

@erictapen
Copy link
Member

That's enough for me to merge ;)

I'm amazed how many people care about the Mastodon module in Nixpkgs, btw. That's great!

e1mo added a commit to cuties-social/cuties-social-nixfiles that referenced this pull request Jul 6, 2023
Manually pullin in the 23.05 release branch (instead of waiting for it
to be available via the channels) because the update (NixOS/nixpkgs#241924)
contains fixes a critical security vulnerability, so we should update
as soon as possible.
e1mo added a commit to cuties-social/cuties-social-nixfiles that referenced this pull request Jul 6, 2023
Manually pullin in the 23.05 release branch (instead of waiting for it
to be available via the channels) because the update (NixOS/nixpkgs#241924)
contains fixes a critical security vulnerability, so we should update
as soon as possible.
@999eagle 999eagle deleted the feat/mastodon-update branch July 10, 2023 20:43
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.

None yet

5 participants