Skip to content

Comments

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

Merged
wegank merged 1 commit intoNixOS:masterfrom
ExpidusOS:feat/llvm-git-commonify-libunwind
Apr 12, 2024
Merged

llvmPackages_{12,13,14,15,16,17,18,git}: use common libunwind#303447
wegank merged 1 commit intoNixOS:masterfrom
ExpidusOS:feat/llvm-git-commonify-libunwind

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.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 11, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-libunwind branch from 7834fb9 to b54e0ec Compare April 11, 2024 21:20
@RossComputerGuy RossComputerGuy changed the title llvmPackages_{12,13,14,15,16,17,18}: use common libunwind llvmPackages_{12,13,14,15,16,17,18,git}: use common libunwind Apr 11, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-libunwind branch from b54e0ec to 0ccd341 Compare April 11, 2024 21:42
@ofborg ofborg bot requested a review from Ericson2314 April 11, 2024 21:51
@ofborg ofborg bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 11, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-libunwind branch 2 times, most recently from 8635797 to 3ef05d3 Compare April 12, 2024 04:10
@ofborg ofborg bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 12, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-libunwind branch 3 times, most recently from 830def3 to af4f4d6 Compare April 12, 2024 05:09
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Apr 12, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-libunwind branch from af4f4d6 to ae92b08 Compare April 12, 2024 05:54
@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 12, 2024
@Ericson2314
Copy link
Member

Why is it (hasPatches || lib.versionOlder release_version "18") and not just hasPatches? I don't see what is special about LLVM 18 still.

@RossComputerGuy
Copy link
Member Author

@Ericson2314 Without it, it causes a rebuild.

@RossComputerGuy
Copy link
Member Author

https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/compilers/llvm/17/libunwind/default.nix vs https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/compilers/llvm/18/libunwind/default.nix

LLVM 18 removes those hooks, 17 has them despite not having any patches. If we were to include the hooks only when there are patches then LLVM 17 will rebuild. We don't want rebuilds.

@Ericson2314
Copy link
Member

@RossComputerGuy OK great thanks! We can do that in a follow-up PR then.

@wegank wegank merged commit ded11d6 into NixOS:master Apr 12, 2024
@RossComputerGuy RossComputerGuy deleted the feat/llvm-git-commonify-libunwind branch April 12, 2024 20: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 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants