Skip to content

Comments

freshBootstrapTools: Overlay the package set with the desired LLVM#267058

Merged
K900 merged 2 commits intoNixOS:masterfrom
toonn:bootstrap-tools-specify-llvm
Nov 17, 2023
Merged

freshBootstrapTools: Overlay the package set with the desired LLVM#267058
K900 merged 2 commits intoNixOS:masterfrom
toonn:bootstrap-tools-specify-llvm

Conversation

@toonn
Copy link
Contributor

@toonn toonn commented Nov 12, 2023

As reported in #241692, since the llvmPackages bump the bootstrap-tools started failing to build due to a mismatch in LLVM versions used to build certain tools.

By overlaying the imported package set to specify llvmPackages, we get everything built with the expected LLVM version.

Description of changes

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

As reported in NixOS#241692, since the `llvmPackages` bump the
bootstrap-tools started failing to build due to a mismatch in LLVM
versions used to build certain tools.

By overlaying the imported package set to specify `llvmPackages`, we get
everything built with the expected LLVM version.
@toonn toonn force-pushed the bootstrap-tools-specify-llvm branch from da6ebd1 to 887d33a Compare November 12, 2023 14:08
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Nov 12, 2023
@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 12, 2023
@toonn toonn requested a review from a user November 14, 2023 12:01
@ghost ghost mentioned this pull request Nov 17, 2023
@ghost
Copy link

ghost commented Nov 17, 2023

I will merge this as soon as CI passes.

@ghost

This comment was marked as duplicate.

@ghost
Copy link

ghost commented Nov 17, 2023

@ofborg build freshBootstrapTools.test

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 17, 2023
@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label Nov 17, 2023
@ghost
Copy link

ghost commented Nov 17, 2023

@vcunat is there some way for me to slap the red "channel blocker" lozenge-of doom on ofborg itself?

freshBootstrapTools.test on aarch64-darwin Queued — Waiting to run this check...
freshBootstrapTools.test on x86_64-darwin Queued — Waiting to run this check...

I haven't had any Darwin machines for almost a decade so there isn't much I can do.

@vcunat
Copy link
Member

vcunat commented Nov 17, 2023

I'm not aware of a way. For OfBorg questions I'd recommend https://matrix.to/#/#ofborg:nixos.org

@ghost
Copy link

ghost commented Nov 17, 2023

freshBootstrapTools on x86_64-darwin — Success Details

Just waiting for aarch64-darwin and we're good to go.

@ghost
Copy link

ghost commented Nov 17, 2023

I'd recommend https://matrix.to/#/#ofborg:nixos.org

I think I'll try tim.cook@apple.com first; higher probability of getting a response 😜

@K900 K900 merged commit b40035f into NixOS:master Nov 17, 2023
@toonn
Copy link
Contributor Author

toonn commented Nov 20, 2023

Ah, darn, wish I could've caught this before merge. The comment's written from a pre-change perspective so it's a bit weird now. Not sure if worth another PR to just slightly alter the wording though?

@vcunat
Copy link
Member

vcunat commented Nov 20, 2023

If you have better wording, I'd suggest at least committing it somewhere while you know it, so that it gets merged at some point if not immediately.

@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

Labels

1.severity: channel blocker Blocks a channel 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: stdenv Standard environment 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants