llvmPackages_18.{clang,libcxx}: Revert redundant openbsd patches#315790
Merged
K900 merged 2 commits intoNixOS:masterfrom May 30, 2024
paparodeo:revert-openbsd-patches
Merged
llvmPackages_18.{clang,libcxx}: Revert redundant openbsd patches#315790K900 merged 2 commits intoNixOS:masterfrom paparodeo:revert-openbsd-patches
K900 merged 2 commits intoNixOS:masterfrom
paparodeo:revert-openbsd-patches
Conversation
Contributor
Author
|
@ofborg build llvmPackages_18.clang llvmPackages_18.libcxx tests.cc-wrapper.llvmTests.llvmPackages_18 |
Member
|
Please include reasons for reverts in commit messages. |
Contributor
|
Too late :( |
Member
|
One day I'll figure out how to make a CI check for it :( |
Contributor
Author
|
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. |
Merged
1 task
Contributor
|
Successfully created backport PR for |
Contributor
|
Backport failed for 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.