Merge branch 'master' into master

This commit is contained in:
Mihai Maruseac 2017-10-04 08:18:25 -07:00 committed by GitHub
commit b64f34ec17

View File

@ -3364,6 +3364,9 @@ packages:
- thread-hierarchy
- bitset-word8
"Deni Bertovic <deni@denibertovic.com> @denibertovic, James Parker <dev@jamesparker.me>":
- docker
# If you stop maintaining a package you can move it here.
# It will then be disabled if it starts causing problems.
# See https://github.com/fpco/stackage/issues/1056
@ -3398,9 +3401,8 @@ packages:
# Once unconstrained, remove the following skipped-tests
# - sbv
# https://github.com/fpco/stackage/issues/2714
- brick < 0.21
- word-wrap < 0.2
# https://github.com/fpco/stackage/issues/2933
- brick < 0.24
# https://github.com/fpco/stackage/issues/2740
- fgl < 5.6