From dd389c8b7179d06423ec7cd38c4d7d1d382c5452 Mon Sep 17 00:00:00 2001 From: James Parker Date: Mon, 17 Feb 2020 19:35:24 -0500 Subject: [PATCH] Support for ghc 8.8.2 --- .travis.yml | 4 ++++ CHANGELOG.md | 6 ++++++ docker.cabal | 8 ++++---- src/Docker/Client/Types.hs | 4 ++++ stack-8.8.2.yaml | 5 +++++ 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 stack-8.8.2.yaml diff --git a/.travis.yml b/.travis.yml index cef8744..8f1ab4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,10 @@ env: - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.6.4 - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.6.4 + - DOCKER_VERSION="1.12.3-0~trusty" GHCVER=8.8.2 + - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.8.2 + - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.8.2 + addons: apt: packages: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fe48f9..5bb1dbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## 0.6.0.3 (2020-02-17) + +- Support for ghc 8.8.2. +- Bump dependency version. +- Use MonadFail for later versions. + ## 0.6.0.1 (2019-05-23) - Support ghc 8.6.4. diff --git a/docker.cabal b/docker.cabal index 88975d9..c597161 100644 --- a/docker.cabal +++ b/docker.cabal @@ -1,5 +1,5 @@ name: docker -version: 0.6.0.2 +version: 0.6.0.3 synopsis: An API client for docker written in Haskell description: See API documentation below. homepage: https://github.com/denibertovic/docker-hs @@ -30,7 +30,7 @@ library , bytestring >= 0.10.0 && < 0.11.0 , containers >= 0.5.0 && < 0.7.0 , data-default-class >= 0.0.1 && < 0.2.0 - , http-client >= 0.4.0 && < 0.6.0 + , http-client >= 0.4.0 && < 0.7.0 , http-types >= 0.9 && < 0.13 , vector , conduit @@ -51,9 +51,9 @@ library , mtl >= 2.0.0 && < 3.0.0 , network >= 2.6.0 , text >= 1.0.0 && < 2.0.0 - , time >= 1.5.0 && < 1.9.0 + , time >= 1.5.0 && < 2.0.0 , scientific >= 0.3.0 && < 0.4.0 - , tls >= 1.3.7 && < 1.5.0 + , tls >= 1.3.7 && < 1.6.0 , unordered-containers >= 0.2.0 && < 0.3.0 , x509 >= 1.6.0 && < 1.8.0 , x509-store >= 1.6.0 && < 1.8.0 diff --git a/src/Docker/Client/Types.hs b/src/Docker/Client/Types.hs index 118f7d0..6b067ab 100644 --- a/src/Docker/Client/Types.hs +++ b/src/Docker/Client/Types.hs @@ -1564,7 +1564,11 @@ instance FromJSON ContainerConfig where macAddress labels stopSignal parseJSON _ = fail "NetworkSettings is not an object." +#if MIN_VERSION_base(4,13,0) +parseIntegerText :: (MonadFail m) => Text -> m Integer +#else parseIntegerText :: (Monad m) => Text -> m Integer +#endif parseIntegerText t = case readMaybe $ T.unpack t of Nothing -> fail "Could not parse Integer" diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml new file mode 100644 index 0000000..2210f0e --- /dev/null +++ b/stack-8.8.2.yaml @@ -0,0 +1,5 @@ +resolver: lts-15.0 +packages: +- '.' +extra-deps: [] +