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

Merge in changes from release branch #248

Merged
merged 10 commits into from
Feb 7, 2023
Merged

Conversation

Ericson2314
Copy link
Collaborator

  1. Ensure the the change log is up to date.

  2. Fix some small markdown errors I found in the older parts of the change log.

  3. Forward-port fix for newer mtl.

  4. Get changes to Cabal metadata reflecting joint maintainership.

I like merging in release branches to keep things in sync, rather than a cherry-picking dance or just doing things purely manually.

andreasabel and others added 9 commits January 23, 2023 07:59
mtl-2.3.1 removed some reexports, so `Control.Monad.Writer` does not
include `Control.Monad` anymore.

This patch should make happy 1.20 work with GHC 9.6 which ships with mtl-2.3.1.
The Hackage release will come without README then, but the README was
anyway outdated.  No special install instructions are needed for happy.
1. I renamed the change log file but forgot to update it.

2. Maintainer got updated to wrong repo URL.
@andreasabel
Copy link
Member

@Ericson2314 : Thanks for taking on my release request!

Atm CI fails here for the new GHC versions. Maybe CI can be fixed here by updating Haskell-CI.
I better not interfere with this PR, because I don't exactly know how you want to do the merging.
But I opened a PR on master that will update CI there:

Let me know in case you need further help with the CI.

@Ericson2314 Ericson2314 merged commit de9b68c into master Feb 7, 2023
@Ericson2314 Ericson2314 deleted the merge-in-from-release branch February 7, 2023 14:03
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