Skip to content

doc/rl2505: move variants to 25.05#410359

Merged
RossComputerGuy merged 1 commit intoNixOS:masterfrom
RossComputerGuy:feat/backport-variants
May 24, 2025
Merged

doc/rl2505: move variants to 25.05#410359
RossComputerGuy merged 1 commit intoNixOS:masterfrom
RossComputerGuy:feat/backport-variants

Conversation

@RossComputerGuy
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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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.

@github-actions github-actions bot added the 8.has: documentation This PR adds or changes documentation label May 24, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 24, 2025
Copy link
Contributor

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

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

LGTM, assuming #410362 is merged first.

As per #410362 (comment), that PR should end up with the release note in the 2505 section, so both branches have the release note in the same files.

@RossComputerGuy
Copy link
Member Author

@MattSturgeon
Copy link
Contributor

3. Merge & backport this PR

Feels like that could be done as part of #410362, but either way it achieves the same result if you backport this PR 👍

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 24, 2025
Copy link
Member

@Aleksanaa Aleksanaa left a comment

Choose a reason for hiding this comment

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

lgtm on description improvement

@RossComputerGuy RossComputerGuy merged commit 4917c73 into NixOS:master May 24, 2025
20 of 23 checks passed
@RossComputerGuy RossComputerGuy deleted the feat/backport-variants branch May 24, 2025 13:36
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 24, 2025

Backport failed for release-25.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-25.05
git worktree add -d .worktree/backport-410359-to-release-25.05 origin/release-25.05
cd .worktree/backport-410359-to-release-25.05
git switch --create backport-410359-to-release-25.05
git cherry-pick -x bb23492d23460e00c4aff751d51ba04d2397da36

@Ericson2314
Copy link
Member

Thank you!

@RossComputerGuy
Copy link
Member Author

Huh backport failed and I didn't see an email about it.

@RossComputerGuy
Copy link
Member Author

Backported in #411008

@mdaniels5757 mdaniels5757 added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: documentation This PR adds or changes documentation 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants