git.iko.soy/typeable/servant
on master help sign in
Fix servant-client with base-compat-0.11
commit52408fea16b530d394d8b3841ab2f448170f0af5 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 15 Sep 2019, 14:50 (7 years ago) parentfa35b5b
6 files changed+25−7
compare with master
unifiedsplit
cabal.project−2 servant-client/CHANGELOG.md+5 servant-client/servant-client.cabal+1−1 servant-client/src/Servant/Client/Internal/HttpClient.hs+7−3 servant-http-streams/CHANGELOG.md+5 servant-http-streams/src/Servant/HttpStreams/Internal.hs+7−1
cabal.project−2
@@ -38,8 +38,6 @@ packages:
3838 doc/cookbook/using-free-client
3939 -- doc/cookbook/open-id-connect
4040
41−
42−
4341tests: True
4442optimization: False
4543-- reorder-goals: True
servant-client/CHANGELOG.md+5
@@ -1,6 +1,11 @@
11[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md)
22[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33
4+0.16.0.1
5+--------
6+
7+- Allow `base-compat-0.11`
8+
490.16
510----
611
servant-client/servant-client.cabal+1−1
@@ -1,6 +1,6 @@
11cabal-version: >=1.10
22name: servant-client
3−version: 0.16
3+version: 0.16.0.1
44
55synopsis: Automatic derivation of querying functions for servant
66category: Servant, Web
servant-client/src/Servant/Client/Internal/HttpClient.hs+7−3
@@ -16,10 +16,11 @@ import Prelude.Compat
1616
1717import Control.Concurrent.MVar
1818 (modifyMVar, newMVar)
19−import qualified Data.ByteString as BS
2019import Control.Concurrent.STM.TVar
2120import Control.Exception
21+ (SomeException (..), catch)
2222import Control.Monad
23+ (unless)
2324import Control.Monad.Base
2425 (MonadBase (..))
2526import Control.Monad.Catch
@@ -27,15 +28,18 @@ import Control.Monad.Catch
2728import Control.Monad.Error.Class
2829 (MonadError (..))
2930import Control.Monad.IO.Class
30− (liftIO)
31+ (MonadIO (..))
3132import Control.Monad.Reader
33+ (MonadReader, ReaderT, ask, runReaderT)
3234import Control.Monad.STM
3335 (STM, atomically)
3436import Control.Monad.Trans.Control
3537 (MonadBaseControl (..))
3638import Control.Monad.Trans.Except
39+ (ExceptT, runExceptT)
3740import Data.Bifunctor
3841 (bimap)
42+import qualified Data.ByteString as BS
3943import Data.ByteString.Builder
4044 (toLazyByteString)
4145import qualified Data.ByteString.Lazy as BSL
@@ -64,8 +68,8 @@ import Network.HTTP.Types
6468 (hContentType, renderQuery, statusCode)
6569import Servant.Client.Core
6670
67−import qualified Servant.Types.SourceT as S
6871import qualified Network.HTTP.Client as Client
72+import qualified Servant.Types.SourceT as S
6973
7074-- | The environment in which a request is run.
7175data ClientEnv
servant-http-streams/CHANGELOG.md+5
@@ -1,6 +1,11 @@
11 [The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-http-streams/CHANGELOG.md)
22[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33
4+0.16.0.1
5+--------
6+
7+- Allow `base-compat-0.11`
8+
490.16
510----
611
servant-http-streams/src/Servant/HttpStreams/Internal.hs+7−1
@@ -18,6 +18,8 @@ import Control.DeepSeq
1818 (NFData, force)
1919import Control.Exception
2020 (IOException, SomeException (..), catch, evaluate, throwIO)
21+import Control.Monad
22+ (unless)
2123import Control.Monad.Base
2224 (MonadBase (..))
2325import Control.Monad.Codensity
@@ -25,9 +27,13 @@ import Control.Monad.Codensity
2527import Control.Monad.Error.Class
2628 (MonadError (..))
2729import Control.Monad.IO.Class
28− (liftIO)
30+ (MonadIO (..))
2931import Control.Monad.Reader
32+ (MonadReader, ReaderT, ask, runReaderT)
33+import Control.Monad.Trans.Class
34+ (lift)
3035import Control.Monad.Trans.Except
36+ (ExceptT, runExceptT)
3137import Data.Bifunctor
3238 (bimap, first)
3339import Data.ByteString.Builder