Merge branch 'master' into patch-2

This commit is contained in:
Mihai Maruseac 2017-10-08 12:20:36 -07:00 committed by GitHub
commit 510a36b033

View File

@ -259,9 +259,9 @@ packages:
- google-translate # bounds: servant - google-translate # bounds: servant
- hackernews # GHC 8.2.1 - hackernews # GHC 8.2.1
- ses-html - ses-html
# - stripe-haskell # via: stripe-http-streams - stripe-haskell
# - stripe-http-streams # via: http-streams - stripe-http-streams
# - stripe-core # bounds: aeson 1.0 - stripe-core
"Piotr Mlodawski @pmlodawski": "Piotr Mlodawski @pmlodawski":
- error-util - error-util
@ -3149,8 +3149,8 @@ packages:
- javascript-extras - javascript-extras
- l10n - l10n
- pipes-category - pipes-category
- pipes-fluid # pipes-fluid # blocked on pipes-misc
- pipes-misc # pipes-misc # blocked due to https://github.com/fpco/stackage/issues/2946
- stm-extras - stm-extras
"Siniša Biđin <sinisa@bidin.eu> @sbidin": "Siniša Biđin <sinisa@bidin.eu> @sbidin":
@ -3323,6 +3323,7 @@ packages:
- listsafe - listsafe
"Serokell <hi@serokell.io> @serokell": "Serokell <hi@serokell.io> @serokell":
- log-warper
- universum - universum
"Lorenz Moesenlechner <moesenle@gmail.com> @moesenle": "Lorenz Moesenlechner <moesenle@gmail.com> @moesenle":
@ -3366,6 +3367,9 @@ packages:
"Deni Bertovic <deni@denibertovic.com> @denibertovic, James Parker <dev@jamesparker.me>": "Deni Bertovic <deni@denibertovic.com> @denibertovic, James Parker <dev@jamesparker.me>":
- docker - docker
"Hexirp <hexirp@gmail.com> @Hexirp":
- doctest-driver-gen
# If you stop maintaining a package you can move it here. # If you stop maintaining a package you can move it here.
# It will then be disabled if it starts causing problems. # It will then be disabled if it starts causing problems.
# See https://github.com/fpco/stackage/issues/1056 # See https://github.com/fpco/stackage/issues/1056
@ -3417,6 +3421,9 @@ packages:
# https://github.com/fpco/stackage/issues/2939 # https://github.com/fpco/stackage/issues/2939
- Glob < 0.9.0 - Glob < 0.9.0
# https://github.com/fpco/stackage/issues/2944
- pipes-category < 0.3.0.0
# end of packages # end of packages
# Package flags are applied to individual packages, and override the values of # Package flags are applied to individual packages, and override the values of
@ -3792,6 +3799,7 @@ expected-test-failures:
- gdax # Needs environment variables set - gdax # Needs environment variables set
- nakadi-client # Needs environment variable set - nakadi-client # Needs environment variable set
- lxd-client # Needs LXD, not available on debian - lxd-client # Needs LXD, not available on debian
- stripe-http-streams # https://github.com/fpco/stackage/issues/2945, needs Stripe account
# Test executable requires arguments # Test executable requires arguments
- hpqtypes - hpqtypes