Skip to content

Comments

llvmPackages_16: 16.0.1 -> 16.0.5#235219

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
willcohen:llvm-16.0.4
Jun 5, 2023
Merged

llvmPackages_16: 16.0.1 -> 16.0.5#235219
vcunat merged 1 commit intoNixOS:staging-nextfrom
willcohen:llvm-16.0.4

Conversation

@willcohen
Copy link
Contributor

Description of changes

Bumped the default.nix version to the latest point release.

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.

@ofborg ofborg 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 May 31, 2023
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.

What needs to be done before this is ready to merge?

@willcohen willcohen marked this pull request as ready for review May 31, 2023 19:59
@willcohen willcohen requested a review from matthewbauer as a code owner May 31, 2023 19:59
@willcohen
Copy link
Contributor Author

@alyssais nothing in particular, I've just never had a PR on llvm before and didn't want to jump the gun before someone looked at it!

@willcohen
Copy link
Contributor Author

Separately, @RaitoBezarius, based on #235216, looks like keeping emscripten up to date will occasionally require more backports from LLVM tip to stable. This PR won't get 3.1.40 working, but hopefully the next point release will.

@willcohen willcohen mentioned this pull request Jun 1, 2023
12 tasks
@willcohen
Copy link
Contributor Author

@RaitoBezarius as noted in #235216, I spoke too soon -- while 3.1.39 built fine already, further attempts to use it and build other things on staging ran into some LLVM issues. I think the backports from 17 to 16 will be necessary to stabilize that for staging, and those are themselves dependent on this landing, so I think this is ready to go now.

For whatever it's worth, emscripten's policy is only to target tip-of-tree LLVM. Keeping llvm_git perpetually up to date just for emscripten strikes me as more challenging than occasional backports. I tried to note that these particular patches are for emscripten -- once the new version stabilizes and emscripten moves on, I think they can be removed. I did submit a backport request which might land in LLVM 16.0.5, but the emscripten maintainers did note that they're skeptical that LLVM will want to include new flag functionality in an old stable branch.

@alyssais
Copy link
Member

alyssais commented Jun 1, 2023

@ofborg build llvmPackages_16

@mweinelt mweinelt added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jun 2, 2023
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jun 2, 2023
@willcohen willcohen changed the base branch from staging to staging-next June 2, 2023 16:21
@github-actions github-actions bot removed the 6.topic: python Python is a high-level, general-purpose programming language. label Jun 2, 2023
@willcohen willcohen changed the title llvmPackages_16: 16.0.1 -> 16.0.4 llvmPackages_16: 16.0.1 -> 16.0.5 Jun 2, 2023
@willcohen
Copy link
Contributor Author

Bumping to 16.0.5, which was just released and will be the final point release on the 16 branch. This will unblock #235216 once landed.

Also, retargeting to staging-next to try to catch the #235556 train. Could also retarget to master, but it'd be good to unbreak what's a little broken with emscripten 3.1.39 on staging-next.

@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. and removed 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 Jun 2, 2023
@ofborg ofborg bot requested a review from alyssais June 2, 2023 16:55
@ofborg ofborg 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. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Jun 2, 2023
@vcunat vcunat merged commit c8d485b into NixOS:staging-next Jun 5, 2023
@vcunat
Copy link
Member

vcunat commented Jun 5, 2023

Uh, I was too trusting. It won't apply patches, let alone build and work.

vcunat added a commit that referenced this pull request Jun 5, 2023
This reverts commit c8d485b, reversing
changes made to 4a640f8.

llvm_16 won't even apply patches successfully, so backing out for now.
@vcunat
Copy link
Member

vcunat commented Jun 5, 2023

Reverted for now. Changes like this can go directly to master, by the way, but they should get at least some basic testing before merging. (I incorrectly assumed they have, in this case)

@willcohen
Copy link
Contributor Author

Apologies — I didn’t do a full rebuild on staging but I can say that this did build locally for me when testing on top of master, at least for Darwin. Will figure out what broke and submit a new PR with fixed patches.

@vcunat
Copy link
Member

vcunat commented Jun 5, 2023

I don't expect the branch changed that, but this amount of rebuilds is small enough to merge directly to master and avoid such complications.

@willcohen
Copy link
Contributor Author

New version of this on #235624 to address the need for revert.

@willcohen willcohen deleted the llvm-16.0.4 branch June 6, 2023 00:56
@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

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 8.has: package (new) This PR adds a new package 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: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants