Skip to content

[staging-next] rhash: fix build on darwin#146572

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
r-burns:rhash
Nov 19, 2021
Merged

[staging-next] rhash: fix build on darwin#146572
vcunat merged 1 commit intoNixOS:staging-nextfrom
r-burns:rhash

Conversation

@r-burns
Copy link
Contributor

@r-burns r-burns commented Nov 19, 2021

Clang requires upstream patch to fix configure script

We're in crunch time for the 21.11 release and this causes lots of rebuilds,
so the patch is applied conditionally to give Hydra a break. After it
gets auto-merged into staging, I'll do a followup PR to make it
unconditional.

Motivation for this change

#146259

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 21.11 Release Notes (or backporting 21.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.

Clang requires upstream patch to fix configure script

We're in crunch time for the 21.11 release and this causes lots of rebuilds,
so the patch is applied conditionally to give Hydra a break. After it
gets auto-merged into staging, I'll do a followup PR to make it
unconditional.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 19, 2021
@ofborg ofborg bot requested a review from andrewrk November 19, 2021 02:07
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 19, 2021
@r-burns r-burns mentioned this pull request Nov 19, 2021
12 tasks
@domenkozar
Copy link
Member

Hydra is pretty bored, darwin wise

@r-burns
Copy link
Contributor Author

r-burns commented Nov 19, 2021

Yes, which works out great here since afaict it's linux that's under the most build pressure :)

@vcunat vcunat merged commit 301d747 into NixOS:staging-next Nov 19, 2021
@r-burns r-burns deleted the rhash branch November 19, 2021 07:54
@bobby285271 bobby285271 mentioned this pull request Apr 8, 2022
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 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.

3 participants