Merge branch 'master' into megaparsec

This commit is contained in:
Mihai Maruseac 2023-12-14 19:02:39 -08:00 committed by GitHub
commit 2fbedc5be8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions

View File

@ -28,14 +28,14 @@ github.
We also have a curator slack channel where we help each other out. We also have a curator slack channel where we help each other out.
The current curator team consists of: The current curator team consists of:
* Adam Bergmark * Adam Bergmark (@bergmark)
* Dan Burton * Alexey Zabelin (@alexeyzab)
* Jens Petersen * Andreas Ländle (@alaendle)
* Luke Murphy * Chris Dornan (@cdornan)
* Michael Snoyman * Dan Burton (@danburton)
* Jens Petersen (@juhp)
We onboarded Luke as the newest member a few months ago and this * Joe Kachmar (@jkachmar)
helped us iron out and document the process further. * Mihai Maruseac (@mihaimaruseac)
You can read the curator documentation here: https://github.com/commercialhaskell/stackage/blob/master/CURATORS.md You can read the curator documentation here: https://github.com/commercialhaskell/stackage/blob/master/CURATORS.md

View File

@ -3212,7 +3212,7 @@ packages:
- boomerang - boomerang
- happstack-hsp - happstack-hsp
- happstack-jmacro - happstack-jmacro
- happstack-server - happstack-server < 7.9 # https://github.com/commercialhaskell/stackage/issues/7207
- happstack-server-tls - happstack-server-tls
- hsx-jmacro - hsx-jmacro
- ixset - ixset
@ -8043,9 +8043,6 @@ packages:
# https://github.com/commercialhaskell/stackage/issues/7074 # https://github.com/commercialhaskell/stackage/issues/7074
- th-abstraction < 0.6.0.0 - th-abstraction < 0.6.0.0
# https://github.com/commercialhaskell/stackage/issues/7086
- tagged < 0.8.8
# https://github.com/commercialhaskell/stackage/issues/7205 # https://github.com/commercialhaskell/stackage/issues/7205
- megaparsec < 9.6 - megaparsec < 9.6
- megaparsec-tests < 9.6 - megaparsec-tests < 9.6