Update from parent

This commit is contained in:
orome 2017-01-02 16:56:06 -05:00 committed by GitHub
commit 03302d261e

View File

@ -1058,6 +1058,7 @@ packages:
- generics-sop-lens
- github
- insert-ordered-containers
- integer-logarithms
- JuicyPixels-scale-dct
- lattices
- monad-http
@ -1384,7 +1385,7 @@ packages:
- autoexporter
- bento
- bmp # Maintained by @benl23x5.
# - ekg-statsd # Maintained by @tibbe.
- ekg-statsd # Maintained by @tibbe.
- flow
- github-release
- gloss # Maintained by @benl23x5.
@ -1566,6 +1567,7 @@ packages:
"Mathieu Boespflug <mboes@tweag.net> @mboes":
# - ihaskell-inline-r # via: ihaskell, ihaskell-blaze
- cassette
- choice
- distributed-closure
- H
- inline-r
@ -2663,6 +2665,22 @@ packages:
"Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":
- hledger-iadd
"Roy Levien <royl@aldaron.com> @orome":
- crypto-enigma
"Boldizsár Németh <nboldi@elte.hu> @nboldi":
- instance-control
- references
- haskell-tools-ast
- haskell-tools-backend-ghc
- haskell-tools-rewrite
- haskell-tools-prettyprint
- haskell-tools-refactor
- haskell-tools-demo
- haskell-tools-cli
- haskell-tools-daemon
- haskell-tools-debug
# 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
@ -2712,13 +2730,6 @@ packages:
# https://github.com/fpco/stackage/issues/2177
- aeson < 1.1.0.0
# https://github.com/fpco/stackage/issues/2178
- hledger < 1.1
- hledger-lib < 1.1
- hledger-api < 1.1
- hledger-ui < 1.1
- hledger-web < 1.1
# end of packages
# Package flags are applied to individual packages, and override the values of