Revert #3639 (Don't pass -package-db and -package flags to --abi-hash) (backport #9384)#9503
Merged
mergify[bot] merged 1 commit into3.10from Dec 15, 2023
Merged
Conversation
jasagredo
force-pushed
the
mergify/bp/3.10/pr-9384
branch
from
d8bc902 to
ae1a574
Compare
Collaborator
|
@mergify refresh |
Contributor
Author
✅ Pull request refreshed |
jasagredo
approved these changes
Dec 14, 2023
Mikolaj
approved these changes
Dec 15, 2023
Member
Mikolaj
left a comment
Mikolaj
left a comment
There was a problem hiding this comment.
It seems only formatting is changed compared to the original PR. Well done.
#9384) * Revert #3639 (Don't pass -package-db and -package flags to --abi-hash) With ghc>=9.6 `ghc --abi-hash` initialises the plugins so it will fail if a cabal file specifies `ghc-options: -fplugin=Foo`. Closes: #9375 * Also revert in GHC.hs --------- Co-authored-by: Hamish Mackenzie <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 01cfac0) # Conflicts: # Cabal/src/Distribution/Simple/GHC.hs # Cabal/src/Distribution/Simple/GHCJS.hs
Mikolaj
force-pushed
the
mergify/bp/3.10/pr-9384
branch
from
ae1a574 to
5f8cdfa
Compare
mergify
bot
added
the
merge delay passed
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
3 participants
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.
This is an automatic backport of pull request #9384 done by Mergify.
Cherry-pick of 01cfac0 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com