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

gerrit: 3.11.0 -> 3.11.1 #373639

Merged
merged 2 commits into from
Jan 14, 2025
Merged

gerrit: 3.11.0 -> 3.11.1 #373639

merged 2 commits into from
Jan 14, 2025

Conversation

felixsinger
Copy link
Member

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

Copy link
Contributor

@ddogfoodd ddogfoodd left a comment

Choose a reason for hiding this comment

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

note that there is #373613, as this PR here also adds you as a maintainer we should probably close the other. Or close this one here and make a new one to add you as a maintainer

@felixsinger
Copy link
Member Author

felixsinger commented Jan 14, 2025

note that there is #373613, as this PR here also adds you as a maintainer we should probably close the other. Or close this one here and make a new one to add you as a maintainer

Thanks for telling! I should have looked for existing PRs before pushing mine. However could we just use this one this time? So I don't need to rebase it and the other one can just be closed.

@flokli flokli added the backport release-24.11 Backport PR automatically label Jan 14, 2025
@flokli flokli merged commit 54547d2 into NixOS:master Jan 14, 2025
25 of 28 checks passed
@nixpkgs-ci
Copy link

nixpkgs-ci bot commented Jan 14, 2025

Backport failed for release-24.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-24.11
git worktree add -d .worktree/backport-373639-to-release-24.11 origin/release-24.11
cd .worktree/backport-373639-to-release-24.11
git switch --create backport-373639-to-release-24.11
git cherry-pick -x 429b850ef4923b61f8964da93c30138e232ba9eb 174397b317855ae0885d39f323196789c0db8619

@flokli flokli removed the backport release-24.11 Backport PR automatically label Jan 14, 2025
@flokli
Copy link
Contributor

flokli commented Jan 14, 2025

Correct backport PR is in #373642.

@felixsinger felixsinger deleted the pkgs/gerrit/update branch January 14, 2025 10:54
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.

3 participants