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: matrix:
fast_finish: true fast_finish: true
include: include:
- ghc: 8.2
- ghc: 8.0
- ghc: 7.10
- ghc: 7.8 - 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, build-depends: base >= 4,
HaskellNet >= 0.3, HaskellNet >= 0.3,
tls >= 1.2, tls >= 1.2,
connection >= 0.2, connection >= 0.2.7,
network >= 2.4, network >= 2.4,
bytestring, bytestring,
data-default data-default
else else
build-depends: base >= 4 && < 5, build-depends: base >= 4 && < 5,
HaskellNet >= 0.3 && < 0.6, HaskellNet >= 0.3 && < 0.6,
tls >= 1.2 && < 1.4, tls >= 1.2 && < 1.5,
connection == 0.2.*, connection >= 0.2.7 && < 0.3,
network >= 2.4 && < 2.7, network >= 2.4 && < 2.7,
bytestring, bytestring,
data-default data-default

View File

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

View File

@ -15,7 +15,7 @@
# resolver: # resolver:
# name: custom-snapshot # name: custom-snapshot
# location: "./custom-snapshot.yaml" # location: "./custom-snapshot.yaml"
resolver: lts-6.9 resolver: lts-7.19
# User packages to be built. # User packages to be built.
# Various formats can be used as shown in the example below. # Various formats can be used as shown in the example below.