Merge branch 'master' into install-llvm-9

This commit is contained in:
Alexey Zabelin 2019-09-10 20:36:06 -07:00 committed by GitHub
commit fe2afb38c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4680,7 +4680,7 @@ packages:
- machines < 0.7
# https://github.com/commercialhaskell/stackage/issues/4532
- profunctors < 5.4
- profunctors < 5.5
# https://github.com/commercialhaskell/stackage/issues/4541
- dependent-sum < 0.5
@ -4756,11 +4756,6 @@ packages:
- parser-combinators < 1.2.0
- parser-combinators-tests < 1.2.0
# https://github.com/commercialhaskell/stackage/issues/4740
- dhall < 1.25.0
- dhall-bash < 1.0.22
- dhall-json < 1.4.0
# https://github.com/commercialhaskell/stackage/issues/4739
- doctemplates < 0.3
@ -4799,9 +4794,6 @@ packages:
- jailbreak-cabal < 1.3.5
- cabal2spec < 2.3
# https://github.com/commercialhaskell/stackage/issues/4797
- sequence-formats < 1.3.3
# https://github.com/commercialhaskell/stackage/issues/4798
- ansi-terminal < 0.10
@ -4824,9 +4816,6 @@ packages:
# https://github.com/commercialhaskell/stackage/issues/4805
- lens-aeson < 1.1
# https://github.com/commercialhaskell/stackage/issues/4806
- trifecta < 2.1
# https://github.com/commercialhaskell/stackage/issues/4807
- aeson < 1.4.5.0
@ -4836,6 +4825,9 @@ packages:
# https://github.com/commercialhaskell/stackage/issues/4811
- polysemy < 1.2.0.0
# https://github.com/commercialhaskell/stackage/issues/4816
- trifecta < 2.1
# end of packages
# Package flags are applied to individual packages, and override the values of
@ -5532,6 +5524,9 @@ expected-test-failures:
# https://github.com/commercialhaskell/stackage/issues/4810
- dns
# https://github.com/commercialhaskell/stackage/issues/4815
- brittany
# end of expected-test-failures
# Benchmarks which are known not to build. Note that, currently we do not run