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

graylog-5_2: 5.2.7 -> 5.2.9 #327730

Merged
merged 2 commits into from
Jul 20, 2024
Merged

graylog-5_2: 5.2.7 -> 5.2.9 #327730

merged 2 commits into from
Jul 20, 2024

Conversation

bbenno
Copy link
Member

@bbenno bbenno commented Jul 16, 2024

Description of changes

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.11 Release Notes (or backporting 23.11 and 24.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.

@bbenno
Copy link
Member Author

bbenno commented Jul 16, 2024

Result of nixpkgs-review pr 327730 run on x86_64-linux 1

1 package built:
  • graylog-5_2

@bbenno bbenno added the 8.has: package (update) This PR updates a package to a newer version label Jul 17, 2024
@pbsbot
Copy link

pbsbot commented Jul 20, 2024

Result of nixpkgs-review pr 327730 run on x86_64-linux 1

1 package built:
  • graylog-5_2

@pbsds pbsds merged commit cee1917 into NixOS:master Jul 20, 2024
31 checks passed
@bbenno bbenno deleted the graylog-5_2/update branch July 22, 2024 23:28
Copy link
Contributor

Backport failed for release-24.05, 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.05
git worktree add -d .worktree/backport-327730-to-release-24.05 origin/release-24.05
cd .worktree/backport-327730-to-release-24.05
git switch --create backport-327730-to-release-24.05
git cherry-pick -x 7a8a2eead7072ad66fb203eac21cb9d8d86ac110 aabff57ea6ccd808bc4257cbe70adaa9ed3b4641

@bbenno
Copy link
Member Author

bbenno commented Jul 22, 2024

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

Since #324698 has not yet been backported to release-24.05 (see also: #329274), cherry-picking commit 7a8a2ee fails.
Adjusting this commit (e.g., by dropping changes for graylog/6_0.nix) risks breaking Graylog 6.0 if the backports are merged in incorrect order. Therefore, I suggest waiting until aforementioned backport is applied and then backport this PR.

Copy link
Contributor

Successfully created backport PR for release-24.05:

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.

4 participants