Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Thierry Bourrillon 2017-04-15 09:52:40 +02:00
commit 699ac0519d

View File

@ -3058,9 +3058,6 @@ packages:
# https://github.com/fpco/stackage/issues/2378
- errors < 2.2.0
# https://github.com/fpco/stackage/issues/2386
- unordered-containers < 0.2.8.0
# https://github.com/fpco/stackage/issues/2393
- HUnit < 1.6.0.0
@ -3070,9 +3067,6 @@ packages:
# https://github.com/fpco/stackage/issues/2433
- hlint < 2
# https://github.com/fpco/stackage/issues/2436
- base-orphans < 0.6
# https://github.com/fpco/stackage/issues/2439
- persistent < 2.7.0
@ -3163,7 +3157,6 @@ package-flags:
functor-classes-compat:
containers: false
unordered-containers: false # https://github.com/fpco/stackage/issues/2386
# end of package-flags