Skip to content
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

Support GHC-8.4.1 and newer deps #925

Merged
merged 2 commits into from
Mar 15, 2018

Conversation

phadej
Copy link
Contributor

@phadej phadej commented Mar 15, 2018

No description provided.

@jkarni
Copy link
Member

jkarni commented Mar 15, 2018

@phadej maybe cherry-picking from the commits that are going into master would make more sense? Otherwise we have two entirely different sets of commits on this branch and on the release branch, but doing the same things.

@phadej phadej merged commit 0881c18 into haskell-servant:release-0.13 Mar 15, 2018
@phadej
Copy link
Contributor Author

phadej commented Mar 15, 2018

I was slightly against doing one-by-one updates in master anyway (especially as it was known that there are other outdated dependencies).

But I'll forward port this to master, when postgresql-client, http-media and servant-auth allows it.

@phadej phadej deleted the release-0.13-ghc-8.4.1 branch March 15, 2018 11:16
@phadej
Copy link
Contributor Author

phadej commented Mar 15, 2018

@jkarni I don't see a problem with diverging histories, there is no intention they would converge.

Sorry for not addressing your comment properly. I feel there is a lot of pressure to put stuff out for GHC-8.4.1 or in into master.

As I said previously, I'd rather not merge exceptions #924 (yesterday) neither aeson #919 (5 days ago) PR, but wait till there's time to do this. I also would like to wait till http-media maintainer has time to react in zmthy/http-media#25

@phadej phadej mentioned this pull request Mar 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants