git.iko.soy/typeable/servant
on master help sign in
Fix 7.8.4 IsList Sequence issue

And other minor 7.8.4 issues.

commit65c2cbb6a96d24a5c50b93e5132cfbd76bd96289 authorJulian K. Arni <jkarni@gmail.com> dateThu 14 Sep 2017, 10:43 (9 years ago) parent83fd4ac
5 files changed+7−6
compare with master
unifiedsplit
servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs+3−2 servant-client/servant-client.cabal+2−1 servant-client/src/Servant/Client/Internal/HttpClient.hs+1−1 servant-server/servant-server.cabal−2 stack-ghc-7.8.4.yaml+1
servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs+3−2
@@ -14,15 +14,16 @@
1414#include "overlapping-compat.h"
1515module Servant.Client.Core.Internal.HasClient where
1616
17+import Prelude ()
1718import Prelude.Compat
18−import Prelude ()
1919
2020import Control.Monad.Error.Class (throwError)
21+import Data.Foldable (toList)
2122import Data.List (foldl')
2223import Data.Proxy (Proxy (Proxy))
24+import Data.Sequence (fromList)
2325import Data.String (fromString)
2426import Data.Text (pack)
25−import GHC.Exts (fromList, toList)
2627import GHC.TypeLits (KnownSymbol, symbolVal)
2728import qualified Network.HTTP.Types as H
2829import Servant.API ((:<|>) ((:<|>)), (:>),
servant-client/servant-client.cabal+2−1
@@ -37,7 +37,8 @@ library
3737 , bytestring >= 0.10 && < 0.11
3838 , aeson >= 0.7 && < 1.3
3939 , attoparsec >= 0.12 && < 0.14
40− , http-client >= 0.4.18.1 && < 0.6
40+ , containers >= 0.5 && < 0.6
41+ , http-client >= 0.4.30 && < 0.6
4142 , http-client-tls >= 0.2.2 && < 0.4
4243 , http-media >= 0.6.2 && < 0.8
4344 , http-types >= 0.8.6 && < 0.10
servant-client/src/Servant/Client/Internal/HttpClient.hs+1−1
@@ -30,9 +30,9 @@ import Data.Foldable (toList)
3030import Data.Functor.Alt (Alt (..))
3131import Data.Monoid ((<>))
3232import Data.Proxy (Proxy (..))
33+import Data.Sequence (fromList)
3334import Data.String (fromString)
3435import qualified Data.Text as T
35−import GHC.Exts (fromList)
3636import GHC.Generics
3737import Network.HTTP.Media (renderHeader)
3838import Network.HTTP.Types (hContentType, renderQuery,
servant-server/servant-server.cabal−2
@@ -164,5 +164,3 @@ test-suite doctests
164164 if impl(ghc >= 8.2)
165165 x-doctest-options: -fdiagnostics-color=never
166166 include-dirs: include
167− other-modules:
168− Build_doctests
stack-ghc-7.8.4.yaml+1
@@ -20,6 +20,7 @@ extra-deps:
2020- hspec-expectations-0.8.2
2121- hspec-wai-0.8.0
2222- http-api-data-0.3.6
23+- http-client-0.4.30
2324- natural-transformation-0.4
2425- primitive-0.6.1.0
2526- servant-js-0.9.3