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

default-gcc-version: 12 -> 13 if stdenv.isDarwin #284165

Merged
merged 1 commit into from
Mar 28, 2024

Conversation

wegank
Copy link
Member

@wegank wegank commented Jan 27, 2024

Description of changes

I imagine this would rebuild liblapack, since gfortran is now at 13. An easy test would then be to see if python3Packages.numpy still works. (EDIT: OK)

Also Wine according to #283642. (EDIT: OK)

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@ofborg ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 27, 2024
@reckenrode
Copy link
Contributor

I was going to say this shouldn’t affect the DXVK issue because it’s cross-compiling to Windows, but apparently the cross compiler version is based on your platform’s default GCC. That’s … unexpected (and somewhat unhelpful).

The MoltenVK issue is going to be addressed this weekend. In the meantime, Wine can be tested by building it without Vulkan support. If it’s already building on Linux, I don’t expect problems with Wine on Darwin beyond the usual.

@wegank wegank marked this pull request as ready for review January 31, 2024 22:05
@wegank
Copy link
Member Author

wegank commented Mar 10, 2024

@vcunat @trofi Any chance of this being merged?

@vcunat
Copy link
Member

vcunat commented Mar 11, 2024

Well, what's the risk of mass breakage that won't be solvable within a couple days? (I'm afraid I won't be spending much energy on darwin-only stuff.)

@vcunat
Copy link
Member

vcunat commented Mar 11, 2024

If it was really risky in this sense, I could create a separate jobset for this PR instead.

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

vcunat commented Mar 22, 2024

@wegank: did you mean that you'd like a Hydra jobset? (by that 👍🏽)

@wegank
Copy link
Member Author

wegank commented Mar 22, 2024

Yes, I'd like a Hydra jobset.

@vcunat
Copy link
Member

vcunat commented Mar 22, 2024

Let's base it on some recent commit that's (most likely) not very broken? Say, this one? https://hydra.nixos.org/eval/1805154#tabs-inputs

@vcunat vcunat force-pushed the gcc-13-everywhere branch from 7be8308 to aab705b Compare March 22, 2024 09:26
@vcunat
Copy link
Member

vcunat commented Mar 22, 2024

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 22, 2024
@wegank
Copy link
Member Author

wegank commented Mar 25, 2024

I can't reproduce any failures with a red cross except for python311Packages.moto, python311Packages.softlayer and welle-io, which seems either flaky or failing on master.

@vcunat Is the new failures count (994) okay or should the failing jobs be re-run to reduce it?

@vcunat
Copy link
Member

vcunat commented Mar 27, 2024

.moto is a common flaky build with lots depending on it. Overall, flakiness is an unpleasant thing and happens for pythonPackages tests a lot. I made sure to clear up those failures. So now it's mainly a question whether to add x86_64-darwin before merging or not.

@wegank
Copy link
Member Author

wegank commented Mar 27, 2024

If I haven't misread the new failures count (which is now 13), the GCC bump on aarch64-darwin is pretty safe.

I don't think it's necessary to have a jobset run on x86_64-darwin: GCC and GFortran are officially supported there, it's even less likely to break than on aarch64-darwin.

@vcunat vcunat merged commit 846c174 into NixOS:staging Mar 28, 2024
19 checks passed
@wegank wegank deleted the gcc-13-everywhere branch March 28, 2024 11:22
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/darwin-updates-news/42249/8

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants