[Backport release-25.05] doc/rl2505: move variants to 25.05#411008
Merged
Aleksanaa merged 1 commit intoNixOS:release-25.05from May 26, 2025
Merged
Conversation
github-actions
bot
added
the
8.has: documentation
13 tasks
doc/release-notes/rl-2511.section.md
Outdated
Comment on lines
6
to
10
Contributor
There was a problem hiding this comment.
Looks like a conflict resolution error. In master, this entry is coming from 89113bb.
Contributor
There was a problem hiding this comment.
TBH, not sure the rl2511 changes need backporting; only rl2505 is relevant on this branch, right?
Member
Author
There was a problem hiding this comment.
Yeah, I thought that PR was backported so I kept the line lol. Will remove the change. The conflict didn't look like it was going to add these lines when I viewed things.
github-actions
bot
added
10.rebuild-darwin: 1
(cherry picked from commit bb23492)
RossComputerGuy
force-pushed
the
backport-410359-to-release-25.05
branch
from
a3c007f to
2678179
Compare
MattSturgeon
approved these changes
May 26, 2025
wegank
added
the
12.approvals: 1
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
(cherry picked from commit bb23492)
Backport of #410359 failed so manually backported.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.