Merge branch 'master' into nightly

This commit is contained in:
Michael Snoyman 2017-09-13 17:38:14 +03:00
commit 0de8be9698
No known key found for this signature in database
GPG Key ID: A048E8C057E86876

View File

@ -2033,8 +2033,7 @@ packages:
- ipython-kernel # GHC 8
"Andrés Sicard-Ramírez <asr@eafit.edu.co> @asr":
[]
# - Agda # GHC 8.2.1
- Agda
"James Cook <mokus@deepbondi.net> @mokus0":
- dependent-sum
@ -3379,6 +3378,9 @@ packages:
# https://github.com/fpco/stackage/issues/2832
- io-streams < 1.5
# https://github.com/fpco/stackage/issues/2860
- language-c < 0.7
# end of packages
# Package flags are applied to individual packages, and override the values of