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

Jump to bottom

cmake: fix darwin bootstrapping #56291

Merged
merged 3 commits into from Feb 24, 2019
Merged

cmake: fix darwin bootstrapping #56291

merged 3 commits into from Feb 24, 2019

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Feb 24, 2019

Motivation for this change

NOTE I only tested the bootstrap cmake at this point, but this might unblock staging-next.

Fixes #56244

/cc @FRidh @vcunat

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@vcunat vcunat self-assigned this Feb 24, 2019
@vcunat
Copy link
Member

vcunat commented Feb 24, 2019 •
edited

Nitpick idea: what about applying darwin-only patches only on darwin? That way we won't need to rebuild elsewhere when touching them (in future).

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Feb 24, 2019
@LnL7
Copy link
Member Author

LnL7 commented Feb 24, 2019

I'm not a fan of conditional patches, but I could make this a darwin only change if we don't want to rebuild linux packages on staging-next right now.

@vcunat
Copy link
Member

vcunat commented Feb 24, 2019 •
edited

Well, it's perhaps no big deal, as it's darwin that's the significant bottleneck on our Hydra. If we had linux-specific patches that occasionally change and cause mass darwin rebuilds, that would be different.

vcunat
vcunat approved these changes Feb 24, 2019
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment •
edited

Choose a reason for hiding this comment

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

I can't see what to wait for, even in case it weren't perfect.

@vcunat vcunat merged commit cb8e6f7 into NixOS:staging-next Feb 24, 2019
vcunat added a commit that referenced this pull request Feb 24, 2019
@vcunat
Merge #56291: cmake: fix darwin bootstrapping
18fe630 
... into staging-next.
@LnL7
Copy link
Member Author

LnL7 commented Feb 24, 2019

My build isn't done yet, but no errors so far.

@vcunat
Copy link
Member

vcunat commented Feb 24, 2019

Our bigmac will surely be better for this stuff, and it was idling now anyway.

@LnL7 LnL7 deleted the darwin-cmake branch February 24, 2019 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@andir andir Awaiting requested review from andir

@edolstra edolstra Awaiting requested review from edolstra

@copumpkin copumpkin Awaiting requested review from copumpkin

@lovek323 lovek323 Awaiting requested review from lovek323

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees

@vcunat vcunat

Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@LnL7 @vcunat @GrahamcOfBorg