Merge branch 'byorgey-patch-9'

This commit is contained in:
Dan Burton 2018-12-20 13:20:58 -05:00
commit 1ccf32f623
No known key found for this signature in database
GPG Key ID: 41F154F410EC12E0

View File

@ -765,21 +765,21 @@ packages:
"Brent Yorgey <byorgey@gmail.com> @byorgey": "Brent Yorgey <byorgey@gmail.com> @byorgey":
- active - active
- diagrams < 0 # via diagrams-contrib - diagrams
- diagrams-builder < 0 # via lens-4.17 - diagrams-builder < 0 # via lens-4.17
- diagrams-cairo < 0 # via lens-4.17 - diagrams-cairo < 0 # via lens-4.17
- diagrams-canvas < 0 # via lens-4.17 - diagrams-canvas < 0 # via lens-4.17
- diagrams-contrib < 0 # via lens-4.17 - diagrams-contrib
- diagrams-core - diagrams-core
- diagrams-gtk < 0 # via diagrams-cairo - diagrams-gtk < 0 # via diagrams-cairo
- diagrams-html5 < 0 # via lens-4.17 - diagrams-html5 < 0 # via lens-4.17
- diagrams-lib - diagrams-lib
- diagrams-postscript < 0 # via lens-4.17 - diagrams-postscript < 0 # via lens-4.17
- diagrams-rasterific < 0 # via lens-4.17 - diagrams-rasterific
- diagrams-solve - diagrams-solve
- diagrams-svg - diagrams-svg
- force-layout < 0 # via lens-4.17 - force-layout
- SVGFonts < 0 # via diagrams-core - SVGFonts
- haxr < 0 # GHC 8.4 via HaXml - haxr < 0 # GHC 8.4 via HaXml
- MonadRandom - MonadRandom
- monoid-extras - monoid-extras
@ -4072,6 +4072,7 @@ skipped-tests:
- cabal-install # tasty 1.1 - cabal-install # tasty 1.1
- colour # QuickCheck-2.11.3 - colour # QuickCheck-2.11.3
- drawille # hspec 2.4 - drawille # hspec 2.4
- diagrams-contrib # QuickCheck 2.12, containers 0.6
- ed25519 # QuickCheck, hlint and more - ed25519 # QuickCheck, hlint and more
- exact-pi # QuickCHeck 2.12, tasty-1.2 - exact-pi # QuickCHeck 2.12, tasty-1.2
- hackage-security # QuickCheck - hackage-security # QuickCheck