Skip to content

Commit dd389c8

Browse files
committed
Support for ghc 8.8.2
1 parent 74a41d7 commit dd389c8

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ env:
4343
- DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.6.4
4444
- DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.6.4
4545

46+
- DOCKER_VERSION="1.12.3-0~trusty" GHCVER=8.8.2
47+
- DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.8.2
48+
- DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.8.2
49+
4650
addons:
4751
apt:
4852
packages:

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# CHANGELOG
22

3+
## 0.6.0.3 (2020-02-17)
4+
5+
- Support for ghc 8.8.2.
6+
- Bump dependency version.
7+
- Use MonadFail for later versions.
8+
39
## 0.6.0.1 (2019-05-23)
410

511
- Support ghc 8.6.4.

docker.cabal

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: docker
2-
version: 0.6.0.2
2+
version: 0.6.0.3
33
synopsis: An API client for docker written in Haskell
44
description: See API documentation below.
55
homepage: https://github.com/denibertovic/docker-hs
@@ -30,7 +30,7 @@ library
3030
, bytestring >= 0.10.0 && < 0.11.0
3131
, containers >= 0.5.0 && < 0.7.0
3232
, data-default-class >= 0.0.1 && < 0.2.0
33-
, http-client >= 0.4.0 && < 0.6.0
33+
, http-client >= 0.4.0 && < 0.7.0
3434
, http-types >= 0.9 && < 0.13
3535
, vector
3636
, conduit
@@ -51,9 +51,9 @@ library
5151
, mtl >= 2.0.0 && < 3.0.0
5252
, network >= 2.6.0
5353
, text >= 1.0.0 && < 2.0.0
54-
, time >= 1.5.0 && < 1.9.0
54+
, time >= 1.5.0 && < 2.0.0
5555
, scientific >= 0.3.0 && < 0.4.0
56-
, tls >= 1.3.7 && < 1.5.0
56+
, tls >= 1.3.7 && < 1.6.0
5757
, unordered-containers >= 0.2.0 && < 0.3.0
5858
, x509 >= 1.6.0 && < 1.8.0
5959
, x509-store >= 1.6.0 && < 1.8.0

src/Docker/Client/Types.hs

+4
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,11 @@ instance FromJSON ContainerConfig where
15641564
macAddress labels stopSignal
15651565
parseJSON _ = fail "NetworkSettings is not an object."
15661566

1567+
#if MIN_VERSION_base(4,13,0)
1568+
parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+
#else
15671570
parseIntegerText :: (Monad m) => Text -> m Integer
1571+
#endif
15681572
parseIntegerText t = case readMaybe $ T.unpack t of
15691573
Nothing ->
15701574
fail "Could not parse Integer"

stack-8.8.2.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
resolver: lts-15.0
2+
packages:
3+
- '.'
4+
extra-deps: []
5+

0 commit comments

Comments
 (0)