Skip to content

llvmPackages: git -> 21.0.0, init 20.1.0-rc1#378713

Merged
RossComputerGuy merged 2 commits intoNixOS:masterfrom
RossComputerGuy:feat/llvm-20
Feb 7, 2025
Merged

llvmPackages: git -> 21.0.0, init 20.1.0-rc1#378713
RossComputerGuy merged 2 commits intoNixOS:masterfrom
RossComputerGuy:feat/llvm-20

Conversation

@RossComputerGuy
Copy link
Member

@RossComputerGuy RossComputerGuy commented Feb 2, 2025 •
edited
Loading

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
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 2, 2025
@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Feb 2, 2025

@ofborg build llvmPackages_20.clang

@RossComputerGuy RossComputerGuy mentioned this pull request Feb 2, 2025
Open
@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Feb 4, 2025 •
edited
Loading

llvmPackages_git.clang builds on x86_64-linux

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Feb 4, 2025

@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, alyssais, dtzWill, lovek323, rrbutani and sternenseemann and removed request for sternenseemann February 4, 2025 18:33
alyssais
alyssais requested changes Feb 5, 2025
View reviewed changes
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?

@peterwaller-arm
Copy link
Contributor

peterwaller-arm commented Feb 5, 2025

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

RossComputerGuy commented Feb 5, 2025

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

@willcohen
Copy link
Contributor

willcohen commented Feb 5, 2025

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

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

RossComputerGuy commented Feb 6, 2025

Ok, @peterwaller-arm's patch is in

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Feb 6, 2025

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.

alyssais
alyssais requested changes Feb 6, 2025
View reviewed changes
pkgs/top-level/aliases.nix Outdated
Copy link
Member

@alyssais alyssais Feb 6, 2025

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.

Copy link
Member Author

@RossComputerGuy RossComputerGuy Feb 6, 2025

Choose a reason for hiding this comment

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

Reverted

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 6, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 7, 2025
@wegank wegank added 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 12.approvals: 1 This PR was reviewed and approved by one person. labels Feb 7, 2025
@RossComputerGuy RossComputerGuy added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Feb 7, 2025
@RossComputerGuy RossComputerGuy merged commit ed9924b into NixOS:master Feb 7, 2025
30 checks passed
@RossComputerGuy RossComputerGuy deleted the feat/llvm-20 branch February 7, 2025 20:24
peterwaller-arm
peterwaller-arm reviewed Feb 7, 2025
View reviewed changes
pkgs/development/compilers/llvm/common/default.nix
relative = "compiler-rt";
});
})
# Fixes baremetal
Copy link
Contributor

@peterwaller-arm peterwaller-arm Feb 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This comment could do with refinement; it's not fixing baremetal (baremetal is fine), it's fixing the linux libc-free build.

Upstream appears to indicate a more appropriate fix would be to provide libc headers to the compiler-rt builtins build. I don't know if that's something tractable or not in the various possible useLLVM scenarios. Could use some help from others interested in determining whether/how this might impact other platforms such as Darwin. cc @emilazy when you're back and @Ericson2314.

Copy link
Contributor

@peterwaller-arm peterwaller-arm Feb 7, 2025

Choose a reason for hiding this comment

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

Another issue here:

nix eval nixpkgs/master#llvmPackages_git.compiler-rt
«error: path '/nix/store/54xn52z7jbib8ryvz6bw244ia34g5hw3-source/pkgs/development/compilers/llvm/git/compiler-rt/libc-free.patch' does not exist»

Copy link
Member Author

@RossComputerGuy RossComputerGuy Feb 7, 2025

Choose a reason for hiding this comment

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

I've opened up #380213 to take care of things

@willcohen willcohen mentioned this pull request Feb 8, 2025
Merged
13 tasks
@zowoq zowoq mentioned this pull request Feb 8, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alyssais alyssais alyssais approved these changes

@willcohen willcohen willcohen approved these changes

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@dtzWill dtzWill Awaiting requested review from dtzWill

@rrbutani rrbutani Awaiting requested review from rrbutani

@lovek323 lovek323 Awaiting requested review from lovek323

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

+1 more reviewer

@peterwaller-arm peterwaller-arm peterwaller-arm left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@RossComputerGuy @peterwaller-arm @willcohen @alyssais @wegank