Skip to content

grub: fix building with gcc-15#445865

Merged
leona-ya merged 1 commit into
NixOS:staging-nixosfrom
71rd:gcc15-grub
Dec 3, 2025
Merged

grub: fix building with gcc-15#445865
leona-ya merged 1 commit into
NixOS:staging-nixosfrom
71rd:gcc15-grub

Conversation

@71rd

@71rd 71rd commented Sep 24, 2025

Copy link
Copy Markdown
Contributor

This commit adds patches from grub HEAD to allow building grub 2.12 with gcc 15, to prepare upgrading the default compiler from gcc 14 that is planned in #440456

Alternative we could await the release of grub 2.14 that is scheduled for November 7

https://lists.gnu.org/archive/html/grub-devel/2025-08/msg00157.html

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • [ x] Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. labels Sep 24, 2025
@71rd 71rd marked this pull request as ready for review September 26, 2025 00:17
@nixpkgs-ci nixpkgs-ci Bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Sep 26, 2025

@Ma27 Ma27 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please retarget to staging-nixos since this causes a rebuild of all nixos tests.
Everything in there will usually be merged with the next kernel update, i.e. ~weekly.

See also https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-rebuilding-all-nixos-tests

@nixpkgs-ci nixpkgs-ci Bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Oct 9, 2025
github-actions[bot]

This comment was marked as resolved.

@71rd 71rd changed the base branch from staging to staging-nixos October 13, 2025 17:58
@nixpkgs-ci nixpkgs-ci Bot closed this Oct 13, 2025
@nixpkgs-ci nixpkgs-ci Bot reopened this Oct 13, 2025
@github-actions github-actions Bot dismissed their stale review October 13, 2025 17:59

All good now, thank you!

@nixpkgs-ci nixpkgs-ci Bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 16, 2025
@leona-ya

Copy link
Copy Markdown
Member

Could you please rebase this PR?

@nixpkgs-ci nixpkgs-ci Bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 30, 2025
@leona-ya leona-ya added this pull request to the merge queue Dec 3, 2025
@leona-ya leona-ya mentioned this pull request Dec 3, 2025
13 tasks
Merged via the queue into NixOS:staging-nixos with commit a2dc452 Dec 3, 2025
28 of 30 checks passed
@71rd 71rd deleted the gcc15-grub branch December 5, 2025 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants