Skip to content

llvmPackages.clang: Drop failing substituteInPlace for CompletionModel.cmake#367056

Merged
alyssais merged 1 commit intoNixOS:stagingfrom
pwaller:fix-replace-fail
Dec 22, 2024
Merged

llvmPackages.clang: Drop failing substituteInPlace for CompletionModel.cmake#367056
alyssais merged 1 commit intoNixOS:stagingfrom
pwaller:fix-replace-fail

Conversation

@pwaller
Copy link
Contributor

@pwaller pwaller commented Dec 21, 2024

Fix up #356120 for clang 12. The failing replacement target was removed
between llvm 12.0.0 and 12.0.1.

Ref: #348568 (comment)
Ref: llvm/llvm-project@3be5dbb
Signed-off-by: Peter Waller [email protected]

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/)
  • 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.

…l.cmake

Fix up NixOS#356120 for clang 12. The failing replacement target was removed
between llvm 12.0.0 and 12.0.1.

Ref: NixOS#348568 (comment)
Ref: llvm/llvm-project@3be5dbb
Signed-off-by: Peter Waller <[email protected]>
@github-actions github-actions bot added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Dec 21, 2024
@pwaller pwaller marked this pull request as ready for review December 21, 2024 12:24
@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 Dec 21, 2024
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.

Can go to master.

@pwaller
Copy link
Contributor Author

pwaller commented Dec 22, 2024

Can't go to master, depends on https://nixpk.gs/pr-tracker.html?pr=356120 which is only in staging currently.

@alyssais alyssais merged commit 9676ba5 into NixOS:staging Dec 22, 2024
4 of 5 checks passed
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 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants