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 -> 21.0.0, init 20.1.0-rc1 #378713

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

RossComputerGuy
Copy link
Member

@RossComputerGuy RossComputerGuy commented Feb 2, 2025

Things done

Bumps git to 21, inits 20.1.0-rc1 from git. Just needs some patches rebased.

  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Feb 2, 2025
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-20 branch 2 times, most recently from addb836 to 6465f4f Compare February 2, 2025 03:41
@RossComputerGuy
Copy link
Member Author

@ofborg build llvmPackages_20.clang

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Feb 4, 2025

llvmPackages_git.clang builds on x86_64-linux

@RossComputerGuy
Copy link
Member Author

@ofborg build llvmPackages_20.clang

@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-20 branch 2 times, most recently from 1377331 to 5fed4f0 Compare February 4, 2025 17:25
@RossComputerGuy RossComputerGuy marked this pull request as ready for review February 4, 2025 18:32
@nix-owners nix-owners bot requested review from Ericson2314, dtzWill, rrbutani, lovek323, alyssais and sternenseemann and removed request for sternenseemann February 4, 2025 18:33
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

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

Wonderful, thank you! ^_^

Maybe it would make sense to include the fix for #363449 (comment) in here as well?

builtins.filter
# Crude method to drop polly patches if present, they're not needed for tblgen.
(p: (!lib.hasInfix "-polly" p))
tools.libllvm.patches;
Copy link
Member

Choose a reason for hiding this comment

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

What changed here? Did it just get reformatted? If so, can that please be a separate commit so this is easier to review?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, it was caused by formatting.

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 has been split out.

@peterwaller-arm
Copy link

LGTM, see llvm/llvm-project#125922 which fixes the libcxx build on aarch64 (and therefore pkgsLLVM builds with llvmPackages_git).

@RossComputerGuy
Copy link
Member Author

Cool, I'll rework this PR with your's and @alyssais's changes tonight after work.

@willcohen
Copy link
Contributor

LGTM -- emscripten can be successfully bumped to version 4.0 once this lands.

@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-20 branch 2 times, most recently from 2e4c9ee to 7588d80 Compare February 6, 2025 03:15
@RossComputerGuy
Copy link
Member Author

Ok, @peterwaller-arm's patch is in

@RossComputerGuy
Copy link
Member Author

Maybe it would make sense to include the fix for #363449 (comment) in here as well?

Bumped it out of git so this is done.

@@ -1595,7 +1595,7 @@ mapAliases {
openbsdCross = openbsd; # Added 2024-09-06

# LLVM packages for (integration) testing that should not be used inside Nixpkgs:
llvmPackages_latest = llvmPackages_19;
llvmPackages_latest = llvmPackages_20;
Copy link
Member

Choose a reason for hiding this comment

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

We've never set this to a release candidate before, as far as I know. I think this should wait until release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants