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_git: bump to LLVM 15 #222894

Merged
merged 3 commits into from
Apr 17, 2023
Merged

Conversation

rrbutani
Copy link
Contributor

@rrbutani rrbutani commented Mar 24, 2023

Description of changes

This PR:

  • applies 8afa321 to llvmPackages_git
  • applies d231d18 to llvmPackages_git
  • bumps llvmPackages_git to LLVM 15.0.7, exactly what llvmPackages_15 uses

The goal here is to continue to bring llvmPackages_git to parity with llvmPackages_15; using the exact same LLVM version will let us avoid having to invest time patching/debugging things that are specific to the (older) LLVM version _git is currently on.

cc: @alyssais @RaitoBezarius

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

@rrbutani
Copy link
Contributor Author

I'm running into the at_quick_exit issues for libcxx described here. That commit was applied to _git in #220527; I need to retarget this PR to staging.

@rrbutani rrbutani changed the base branch from master to staging March 24, 2023 13:22
@RaitoBezarius RaitoBezarius marked this pull request as draft March 24, 2023 13:26
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

Looks reasonable to me.

…as overridable args

backport of d231d18 from NixOS#194634
(llvmPackages_15)
bumping `llvmPackages_git` to match `llvmPackages_15`; this will let us
continuing bringing `llvmPackages_git` to parity with `llvmPackages_15`
without needing to invest time and effort into getting the current
llvmPackages_git's commit's test suite to pass under all the platforms,
etc.

this will also allow us to begin diffing derivations between
`llvmPackages_15` and `llvmPackages_git` as a way of tracking down
remaining differences between the package sets
@alyssais alyssais merged commit 98182ae into NixOS:master Apr 17, 2023
@alyssais
Copy link
Member

I'm a bit confused why this causes Darwin rebuilds, though…

@rrbutani rrbutani deleted the bump-llvm-git branch April 18, 2023 03:26
@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.

3 participants