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

qemu: use apple-sdk_13; fix build #367606

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Conversation

paparodeo
Copy link
Contributor

@paparodeo paparodeo commented Dec 23, 2024

qemu 9.2.0 uses hv_vm_config_get_default_ipa_size which showed up in macOS 13

https://hydra.nixos.org/build/282523939

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.

qemu 9.2.0 uses hv_vm_config_get_default_ipa_size which showed up in
macOS 13
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 23, 2024
@paparodeo paparodeo marked this pull request as ready for review December 23, 2024 11:04
@paparodeo paparodeo changed the title [staging-next] qemu: use apple-sdk_13 [staging-next] qemu: use apple-sdk_13; fix build Dec 23, 2024
@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label Dec 23, 2024
@vcunat vcunat changed the base branch from staging-next to master December 23, 2024 13:59
@paparodeo paparodeo changed the title [staging-next] qemu: use apple-sdk_13; fix build qemu: use apple-sdk_13; fix build Dec 23, 2024
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Looks good. I tested it builds on aarch64-darwin now.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 23, 2024
@alyssais
Copy link
Member

Ack

@vcunat vcunat merged commit de18642 into NixOS:master Dec 23, 2024
76 of 77 checks passed
@paparodeo paparodeo deleted the qemu-fix-darwin-sdk13 branch December 23, 2024 21:13
Comment on lines -15190 to -15191
if stdenv.hostPlatform.isDarwin then
overrideSDK stdenv {
Copy link
Contributor

Choose a reason for hiding this comment

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

There is another overrideSDK in qemu that can probably be removed?

buildPlatformStdenv =
if stdenv.buildPlatform.isDarwin then
overrideSDK buildPackages.stdenv {
# Keep these values in sync with `all-packages.nix`.
darwinSdkVersion = "12.3";
darwinMinVersion = "12.0";
}
else
buildPackages.stdenv;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed in #367764

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: channel blocker Blocks a channel 10.rebuild-darwin: 11-100 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants