Skip to content

Fix #8377: allow text-2.0 and time-1.12 in cabal-install (backport #8398)#8436

Merged
Mikolaj merged 1 commit into3.8from
mergify/bp/3.8/pr-8398
Aug 30, 2022
Merged

Fix #8377: allow text-2.0 and time-1.12 in cabal-install (backport #8398)#8436
Mikolaj merged 1 commit into3.8from
mergify/bp/3.8/pr-8398

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2022

This is an automatic backport of pull request #8398 done by Mergify.

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 refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot mentioned this pull request Aug 30, 2022
Merged
Mikolaj
Mikolaj approved these changes Aug 30, 2022
View reviewed changes
Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Mikolaj
Copy link
Member

Mikolaj commented Aug 30, 2022

Hm, Quick jobst broke in a strange way:

alex --latin1 --ghc -o Cabal-syntax/src/Distribution/Fields/Lexer.hs templates/Lexer.x
alex: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.29' not found (required by alex)
make: *** [Cabal-syntax/src/Distribution/Fields/Lexer.hs] Error 1
Makefile:24: recipe for target 'Cabal-syntax/src/Distribution/Fields/Lexer.hs' failed
Error: Process completed with exit code 2.

Let me restart the test.

@Mikolaj
Copy link
Member

Mikolaj commented Aug 30, 2022

I guess we need to backport #8418 first. Let me do that.

@Mikolaj
Copy link
Member

Mikolaj commented Aug 30, 2022

@mergify rebase

@andreasabel @mergify
Fix #8377: allow text-2.0 an time-1.12 in cabal-install
b445222 
Also allow latest aeson, network-wait, optparse-applicative in cabal-testsuite.

(cherry picked from commit b1a46fc)
@mergify
Copy link
Contributor Author

mergify bot commented Aug 30, 2022

rebase

✅ Branch has been successfully rebased

@jneira jneira force-pushed the mergify/bp/3.8/pr-8398 branch from fcc8aa5 to b445222 Compare August 30, 2022 13:30
@Mikolaj
Copy link
Member

Mikolaj commented Aug 30, 2022

Failed further on this time. Restarted again.

@Mikolaj
Copy link
Member

Mikolaj commented Aug 30, 2022

Almost worked this time. Restarted.

@Mikolaj
Copy link
Member

Mikolaj commented Aug 30, 2022

Validate windows-latest ghc-8.0.2 doesn't want to cooperate, but others pass fine, so let me merge manually.

@Mikolaj Mikolaj merged commit 3b11fef into 3.8 Aug 30, 2022
@mergify mergify bot deleted the mergify/bp/3.8/pr-8398 branch August 31, 2022 00:29
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Sep 2, 2022
@ulysses4ever ulysses4ever removed the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Sep 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mikolaj Mikolaj Mikolaj approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Mikolaj @ulysses4ever @andreasabel