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.

Sign up for GitHub

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

[Backport release-21.11] llvmPackages_git: fix darwin build #147669

Merged
merged 2 commits into from
Dec 3, 2021
Merged

[Backport release-21.11] llvmPackages_git: fix darwin build #147669

merged 2 commits into from
Dec 3, 2021

Conversation

midchildan
Copy link
Member

@midchildan midchildan commented Nov 28, 2021 •
edited
Loading

Motivation for this change

Backport #147668. Same fix as #147514, but for llvmPackages_git instead of llvmPackages_13

ZHF: #144627

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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 28, 2021
midchildan
midchildan commented Nov 28, 2021
View reviewed changes
pkgs/top-level/aliases.nix
Comment on lines +1232 to +1234
} // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
inherit (llvmPackages_11) stdenv;
}));
Copy link
Member Author

Choose a reason for hiding this comment

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

This change isn't present in the PR for staging. It is necessary here because the Darwin stdenv in staging-21.11 uses LLVM 7, which refuses to compile libcxx from LLVM 14.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 28, 2021
@risicle
Copy link
Contributor

risicle commented Nov 28, 2021

We usually wait for the master PR to get merged then use the backport label for this, that way the commits end up with the right links to the final commits from which they were cherry-picked.

@midchildan midchildan marked this pull request as draft November 28, 2021 12:15
@midchildan
Copy link
Member Author

I marked this as draft so that I can update this PR when #147668 gets updated.

I believe the backport label can't be used here because of the additional changes here.

@risicle
Copy link
Contributor

risicle commented Nov 28, 2021

👍 cunning

@midchildan midchildan marked this pull request as ready for review November 30, 2021 15:55
@midchildan
Copy link
Member Author

Marked as ready for review since #147668 has been merged.

jonringer
jonringer approved these changes Dec 3, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

@jonringer jonringer merged commit e5fbea2 into NixOS:staging-21.11 Dec 3, 2021
@midchildan midchildan deleted the fix/staging-21.11/libcxxgit branch December 3, 2021 12:55
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer matthewbauer is a code owner

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@midchildan @risicle @jonringer @rrbutani