Merge branch 'commercialhaskell:master' into proto-lens

This commit is contained in:
Joshua Chia 2021-10-11 08:55:16 +08:00 committed by GitHub
commit 9643110408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1597,7 +1597,7 @@ packages:
- neat-interpolation - neat-interpolation
- optima - optima
- partial-handler - partial-handler
- postgresql-binary - postgresql-binary < 0.12.4.2 # https://github.com/commercialhaskell/stackage/issues/6217
- postgresql-syntax - postgresql-syntax
- primitive-extras - primitive-extras
- ptr-poker - ptr-poker
@ -5110,7 +5110,7 @@ packages:
- text-latin1 - text-latin1
- text-postgresql - text-postgresql
- text-printer - text-printer
- text-short - text-short < 0.1.4 # https://github.com/commercialhaskell/stackage/issues/6220
- text-zipper - text-zipper
- tf-random - tf-random
- th-extras - th-extras
@ -6867,6 +6867,9 @@ skipped-builds:
# or if Setup fails because of missing foreign libraries. # or if Setup fails because of missing foreign libraries.
# Otherwise place them in expected-test-failures. # Otherwise place them in expected-test-failures.
skipped-tests: skipped-tests:
# aeson-2
- jsonifier
# Missing foreign libraries # Missing foreign libraries
- symengine - symengine
@ -7534,6 +7537,8 @@ expected-benchmark-failures:
# or if Setup fails because of missing foreign libraries. # or if Setup fails because of missing foreign libraries.
# Otherwise place them in expected-benchmark-failures. # Otherwise place them in expected-benchmark-failures.
skipped-benchmarks: skipped-benchmarks:
# aeson-2
- jsonifier
# Cyclic dependencies # Cyclic dependencies
- attoparsec - attoparsec