Skip to content

llvmPackages_18.{clang,libcxx}: Revert redundant openbsd patches #315790

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

Merged
merged 2 commits into from
May 30, 2024
Merged

llvmPackages_18.{clang,libcxx}: Revert redundant openbsd patches #315790

merged 2 commits into from
May 30, 2024

Conversation

paparodeo
Copy link
Contributor

Description of changes

#311836 broke llvm-18 due to redundant patches.
changes incorporated into llvm 18.1.6 -- no need to patch
https://github.com/llvm/llvm-project/commits/llvmorg-18.1.6/

fixes: https://hydra.nixos.org/build/261662365

cc: @Ericson2314

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.11 Release Notes (or backporting 23.11 and 24.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.

@paparodeo paparodeo mentioned this pull request May 30, 2024
13 tasks
@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 30, 2024
@paparodeo
Copy link
Contributor Author

@ofborg build llvmPackages_18.clang llvmPackages_18.libcxx tests.cc-wrapper.llvmTests.llvmPackages_18

@K900 K900 merged commit 225169d into NixOS:master May 30, 2024
@alyssais
Copy link
Member

Please include reasons for reverts in commit messages.

@K900
Copy link
Contributor

K900 commented May 30, 2024

Too late :(

@paparodeo paparodeo deleted the revert-openbsd-patches branch May 30, 2024 07:40
@alyssais
Copy link
Member

One day I'll figure out how to make a CI check for it :(

@paparodeo
Copy link
Contributor Author

paparodeo commented May 30, 2024

i considered adding a message but the commits shouldn't have happened in the first place and i figured the revert implied that they were a mistake... if there were some tricky bits i probably would've added something -- next time.

Copy link
Contributor

Successfully created backport PR for release-24.05:

@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 30, 2024
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-315790-to-release-24.05 origin/release-24.05
cd .worktree/backport-315790-to-release-24.05
git switch --create backport-315790-to-release-24.05
git cherry-pick -x 8110970af91e4fc0c44c0addba58c72770d60c95 30d42ba5694da36ffab9f68c12e4468e1af8190d

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.

5 participants