Merge branch 'garetxe-master'

This commit is contained in:
Dan Burton 2018-03-18 19:35:00 -07:00
commit c0bdc04d11
No known key found for this signature in database
GPG Key ID: 41F154F410EC12E0

View File

@ -2563,16 +2563,18 @@ packages:
- sum-type-boilerplate
"Iñaki García Etxebarria <garetxe@gmail.com> @garetxe":
- haskell-gi
- haskell-gi-base
- gi-atk
- gi-cairo
- gi-glib
- gi-gio
- gi-gobject
- gi-gtk
# - gi-gtk-hs # GHC 8.4 via base-4.11.0.0
- gi-gtksource
- gi-javascriptcore
- haskell-gi
- haskell-gi-base
# - gi-gtk-hs # gi-gio fails to build with ghc-8.2
# - gi-gtksource # gi-gio fails to build with ghc-8.2
# - gi-webkit2 # gi-gio fails to build with ghc-8.2
- gi-webkit2
"Brandon Simmons <brandon.m.simmons@gmail.com> @jberryman":
- directory-tree
@ -4124,9 +4126,6 @@ packages:
# https://github.com/fpco/stackage/issues/3183
- criterion < 1.4
# https://github.com/fpco/stackage/issues/3186
- haskell-gi-overloading < 1
# https://github.com/fpco/stackage/issues/3337
- aeson < 1.3