eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix 7.8.4 IsList Sequence issue

Browse source 
And other minor 7.8.4 issues.
This commit is contained in:
Julian K. Arni 2017-09-14 10:43:57 -04:00
parent 83fd4acf21
commit 65c2cbb6a9
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs
View file

@ -14,15 +14,16 @@
#include "overlapping-compat.h" #include "overlapping-compat.h"
module Servant.Client.Core.Internal.HasClient where module Servant.Client.Core.Internal.HasClient where
import Prelude.Compat
import Prelude () import Prelude ()
import Prelude.Compat
import Control.Monad.Error.Class (throwError) import Control.Monad.Error.Class (throwError)
import Data.Foldable (toList)
import Data.List (foldl') import Data.List (foldl')
import Data.Proxy (Proxy (Proxy)) import Data.Proxy (Proxy (Proxy))
import Data.Sequence (fromList)
import Data.String (fromString) import Data.String (fromString)
import Data.Text (pack) import Data.Text (pack)
import GHC.Exts (fromList, toList)
import GHC.TypeLits (KnownSymbol, symbolVal) import GHC.TypeLits (KnownSymbol, symbolVal)
import qualified Network.HTTP.Types as H import qualified Network.HTTP.Types as H
import Servant.API ((:<|>) ((:<|>)), (:>), import Servant.API ((:<|>) ((:<|>)), (:>),

3
servant-client/servant-client.cabal
View file

@ -37,7 +37,8 @@ library
, bytestring >= 0.10 && < 0.11 , bytestring >= 0.10 && < 0.11
, aeson >= 0.7 && < 1.3 , aeson >= 0.7 && < 1.3
, attoparsec >= 0.12 && < 0.14 , attoparsec >= 0.12 && < 0.14
, http-client >= 0.4.18.1 && < 0.6 , containers >= 0.5 && < 0.6
, http-client >= 0.4.30 && < 0.6
, http-client-tls >= 0.2.2 && < 0.4 , http-client-tls >= 0.2.2 && < 0.4
, http-media >= 0.6.2 && < 0.8 , http-media >= 0.6.2 && < 0.8
, http-types >= 0.8.6 && < 0.10 , http-types >= 0.8.6 && < 0.10

2
servant-client/src/Servant/Client/Internal/HttpClient.hs
View file

@ -30,9 +30,9 @@ import Data.Foldable (toList)
import Data.Functor.Alt (Alt (..)) import Data.Functor.Alt (Alt (..))
import Data.Monoid ((<>)) import Data.Monoid ((<>))
import Data.Proxy (Proxy (..)) import Data.Proxy (Proxy (..))
import Data.Sequence (fromList)
import Data.String (fromString) import Data.String (fromString)
import qualified Data.Text as T import qualified Data.Text as T
import GHC.Exts (fromList)
import GHC.Generics import GHC.Generics
import Network.HTTP.Media (renderHeader) import Network.HTTP.Media (renderHeader)
import Network.HTTP.Types (hContentType, renderQuery, import Network.HTTP.Types (hContentType, renderQuery,

2
servant-server/servant-server.cabal
View file

@ -164,5 +164,3 @@ test-suite doctests
if impl(ghc >= 8.2) if impl(ghc >= 8.2)
x-doctest-options: -fdiagnostics-color=never x-doctest-options: -fdiagnostics-color=never
include-dirs: include include-dirs: include
other-modules:
Build_doctests

1
stack-ghc-7.8.4.yaml
View file

@ -20,6 +20,7 @@ extra-deps:
- hspec-expectations-0.8.2 - hspec-expectations-0.8.2
- hspec-wai-0.8.0 - hspec-wai-0.8.0
- http-api-data-0.3.6 - http-api-data-0.3.6
- http-client-0.4.30
- natural-transformation-0.4 - natural-transformation-0.4
- primitive-0.6.1.0 - primitive-0.6.1.0
- servant-js-0.9.3 - servant-js-0.9.3