Merge branch 'master' into h2c

This commit is contained in:
Chris Dornan 2017-07-09 17:52:22 +01:00 committed by GitHub
commit aeeb2f07cc

View File

@ -1,6 +1,9 @@
ghc-major-version: "8.0"
# Constraints for brand new builds
packages:
"Nobutada Matsubara <t12307043@gunma-u.ac.jp> @matsubara0507":
- chatwork
"Pavol Klacansky <pavol@klacansky.com> @pavolzetor":
- openexr-write
@ -3139,6 +3142,7 @@ packages:
"Edward Amsden <edwardamsden@gmail.com> @eamsden":
- h2c
- bno055-haskell
# If you stop maintaining a package you can move it here.
# It will then be disabled if it starts causing problems.
@ -3288,6 +3292,9 @@ packages:
# https://github.com/fpco/stackage/issues/2636
- hashable < 1.2.6.1
# https://github.com/fpco/stackage/issues/2640
- hoauth2 < 1.3.0
# end of packages
# Package flags are applied to individual packages, and override the values of