Update dependencies. See fpco/stackage#2693

This commit is contained in:
Leza Lutonda 2017-08-01 14:59:33 +01:00
parent 631a0bcbbb
commit 94266dd970
4 changed files with 17 additions and 18 deletions

View File

@ -2,9 +2,7 @@ language: haskell
matrix:
fast_finish: true
include:
- ghc: 8.2
- ghc: 8.0
- ghc: 7.10
- ghc: 7.8
- ghc: 7.6
- ghc: 7.3
allow_failures:
- ghc: 7.8
install: cabal install --only-dependencies --enable-tests -f NoUpperBounds

View File

@ -35,15 +35,15 @@ library
build-depends: base >= 4,
HaskellNet >= 0.3,
tls >= 1.2,
connection >= 0.2,
connection >= 0.2.7,
network >= 2.4,
bytestring,
data-default
else
build-depends: base >= 4 && < 5,
HaskellNet >= 0.3 && < 0.6,
tls >= 1.2 && < 1.4,
connection == 0.2.*,
tls >= 1.2 && < 1.5,
connection >= 0.2.7 && < 0.3,
network >= 2.4 && < 2.7,
bytestring,
data-default

View File

@ -28,6 +28,7 @@ connectionToStream c cfg = BSStream
, bsClose = connectionClose c
, bsIsOpen = return True
, bsGetLine = connectionGetLine maxl c >>= withLog "RECV"
, bsWaitForInput = connectionWaitForInput c
} where maxl = sslMaxLineLength cfg
withLog = if sslLogToConsole cfg then logToConsole
else flip (const . return)

View File

@ -1,5 +1,5 @@
# This file was automatically generated by 'stack init'
#
#
# Some commonly used options have been documented as comments in this file.
# For advanced use and comprehensive documentation of the format, please see:
# http://docs.haskellstack.org/en/stable/yaml_configuration/
@ -7,7 +7,7 @@
# Resolver to choose a 'specific' stackage snapshot or a compiler version.
# A snapshot resolver dictates the compiler version and the set of packages
# to be used for project dependencies. For example:
#
#
# resolver: lts-3.5
# resolver: nightly-2015-09-21
# resolver: ghc-7.10.2
@ -15,11 +15,11 @@
# resolver:
# name: custom-snapshot
# location: "./custom-snapshot.yaml"
resolver: lts-6.9
resolver: lts-7.19
# User packages to be built.
# Various formats can be used as shown in the example below.
#
#
# packages:
# - some-directory
# - https://example.com/foo/bar/baz-0.0.2.tar.gz
@ -31,7 +31,7 @@ resolver: lts-6.9
# subdirs:
# - auto-update
# - wai
#
#
# A package marked 'extra-dep: true' will only be built if demanded by a
# non-dependency (i.e. a user package), and its test suites and benchmarks
# will not be run. This is useful for tweaking upstream packages.
@ -49,18 +49,18 @@ extra-package-dbs: []
# Control whether we use the GHC we find on the path
# system-ghc: true
#
#
# Require a specific version of stack, using version ranges
# require-stack-version: -any # Default
# require-stack-version: ">=1.1"
#
#
# Override the architecture used by stack, especially useful on Windows
# arch: i386
# arch: x86_64
#
#
# Extra directories used by stack for building
# extra-include-dirs: [/path/to/dir]
# extra-lib-dirs: [/path/to/dir]
#
#
# Allow a newer minor version of GHC than the snapshot specifies
# compiler-check: newer-minor
# compiler-check: newer-minor