Merge branch 'master' into enable-hreader-lens

This commit is contained in:
Mihai Maruseac 2017-05-24 17:25:04 -07:00 committed by GitHub
commit b6a34a4574

View File

@ -2407,6 +2407,7 @@ packages:
"Denis Redozubov <denis.redozubov@gmail.com> @dredozubov":
- tracy
- hreader-lens
- schematic
"Yuji Yamamoto <whosekiteneverfly@gmail.com> @igrep":
- yes-precure5-command
@ -3155,9 +3156,6 @@ packages:
# https://github.com/fpco/stackage/issues/2478
- generics-sop < 0.3.0.0
# https://github.com/fpco/stackage/issues/2481
- megaparsec < 5.3.0
# https://github.com/fpco/stackage/issues/2487
- graphviz < 2999.19
@ -3193,6 +3191,16 @@ packages:
# https://github.com/fpco/stackage/issues/2533
- mysql-haskell < 0.8.1.0
# https://github.com/fpco/stackage/issues/2537
- servant < 0.11
- servant-client < 0.11
- servant-server < 0.11
- servant-docs < 0.10.0.1
- servant-foreign < 0.10.0.1
# https://github.com/fpco/stackage/issues/2538
- criterion < 1.2
# end of packages
# Package flags are applied to individual packages, and override the values of