From 558fe3ddc0e1a7b046910f6d50f508cb94fd4340 Mon Sep 17 00:00:00 2001 From: Juan Pedro Villa Isaza Date: Tue, 16 Jan 2018 17:39:19 -0500 Subject: [PATCH] Allow http-conduit 2.3 --- licensor.cabal | 2 +- src/Licensor.hs | 3 +-- stack.yaml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/licensor.cabal b/licensor.cabal index c3b56c9..72a0083 100644 --- a/licensor.cabal +++ b/licensor.cabal @@ -39,7 +39,7 @@ library , Cabal >= 1.22 && < 2.1 , containers , directory - , http-conduit >= 2.1 && < 2.3 + , http-conduit >= 2.1 && < 2.4 , process default-language: Haskell2010 diff --git a/src/Licensor.hs b/src/Licensor.hs index 00ac626..85e56c1 100644 --- a/src/Licensor.hs +++ b/src/Licensor.hs @@ -51,8 +51,7 @@ import qualified Data.Set as Set import System.Directory -- http-conduit ---import Network.HTTP.Client.Conduit -import Network.HTTP.Simple +import Network.HTTP.Simple (HttpException, getResponseBody, httpLBS, parseRequest) -- licensor import qualified Paths_licensor diff --git a/stack.yaml b/stack.yaml index 8b921c4..f224f8d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: lts-7.0 +resolver: nightly-2018-01-16