Merge branch 'nightly'

This commit is contained in:
Jens Petersen 2016-01-28 19:26:56 +09:00
commit e52faf91f7

View File

@ -1691,8 +1691,7 @@ packages:
- rank1dynamic
"Alexander Vershilov <alexander.vershilov@tweag.io> @qnikst":
# https://github.com/fpco/stackage/issues/1172
# - imagemagick
- imagemagick
- network-transport-zeromq
"Takahiro Himura <himuratk421@gmail.com> @thimura":
@ -1951,9 +1950,6 @@ packages:
# https://github.com/fpco/stackage/issues/1185
- quickcheck-instances < 0.3.12
# https://github.com/fpco/stackage/issues/1188
- generic-deriving < 1.10
- process-extras < 0.3.3.8
# end of packages