Skip to content

Comments

Backport 386424 to release 24.11#388329

Closed
erichelgeson wants to merge 1 commit intoNixOS:release-24.11from
erichelgeson:backport-386424-to-release-24.11
Closed

Backport 386424 to release 24.11#388329
erichelgeson wants to merge 1 commit intoNixOS:release-24.11from
erichelgeson:backport-386424-to-release-24.11

Conversation

@erichelgeson
Copy link
Contributor

Fixed cherry-pick of #386424 to 24.11

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.

(cherry picked from commit ba128c8)
@github-actions github-actions bot added the 6.topic: games Gaming on NixOS label Mar 9, 2025
@erichelgeson erichelgeson force-pushed the backport-386424-to-release-24.11 branch from 05358e9 to 917aa98 Compare March 10, 2025 00:58
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 10, 2025
@nix-owners nix-owners bot requested a review from aidalgol March 10, 2025 01:05
@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Mar 11, 2025
@wolfgangwalther
Copy link
Contributor

merge conflict

@wolfgangwalther wolfgangwalther added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 23, 2025
@erichelgeson
Copy link
Contributor Author

Superseded by #389707 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: games Gaming on NixOS 10.rebuild-darwin: 0 This PR does not cause any packages 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. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants