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

llvmPackages_{12,13,14,15,16,17,18,git}: use common llvm #303521

Merged
merged 1 commit into from
Apr 14, 2024

Conversation

RossComputerGuy
Copy link
Member

Description of changes

Partial split from #299807

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.

@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-llvm branch 2 times, most recently from c19c7e8 to 5bd861e Compare April 12, 2024 23:37
@RossComputerGuy
Copy link
Member Author

Just need to fix the Darwin issue, idk why it happens.

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Apr 14, 2024

No more merge conflict

Edit: I was in the wrong branch

@wegank
Copy link
Member

wegank commented Apr 14, 2024

Oh, this PR also targets staging, but I think master should be OK?

@RossComputerGuy
Copy link
Member Author

@wegank No, I tried master but I was getting those spooky binutils.override missing errors in pkgs/stdenv/adapters.nix. I was suggested to switch to staging and it fixed my issues.

@wegank
Copy link
Member

wegank commented Apr 14, 2024

And another merge conflict here.

@RossComputerGuy
Copy link
Member Author

Fixed the merge conflict

@wegank wegank merged commit ef8ac4b into NixOS:staging Apr 14, 2024
19 checks passed
@RossComputerGuy RossComputerGuy deleted the feat/llvm-git-commonify-llvm branch April 15, 2024 01:19
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants