c755f47 · servant · git.iko.soy

servant-server/servant-server.cabal+1

compare with master

unifiedsplit

@@ -47,6 +47,7 @@ library

47 Servant.Utils.StaticFiles

48 build-depends:

49 base >= 4.7 && < 5

50+ , base-compat >= 0.9

50 , aeson >= 0.7 && < 0.12

51 , aeson >= 0.7 && < 0.12

51 , attoparsec >= 0.12 && < 0.14

52 , attoparsec >= 0.12 && < 0.14

52 , base64-bytestring == 1.0.*

53 , base64-bytestring == 1.0.*

servant-server/src/Servant/Server/Internal.hs+1−3

@@ -22,9 +22,6 @@ module Servant.Server.Internal

22 , module Servant.Server.Internal.ServantErr

23 ) where

24

25−#if !MIN_VERSION_base(4,8,0)

26−import Control.Applicative ((<$>))

27−#endif

28import Control.Monad.Trans.Except (ExceptT)

25import Control.Monad.Trans.Except (ExceptT)

29import qualified Data.ByteString as B

26import qualified Data.ByteString as B

30import qualified Data.ByteString.Char8 as BC8

27import qualified Data.ByteString.Char8 as BC8

@@ -45,6 +42,7 @@ import Network.Wai (Application, Request, Response,

45 rawQueryString, remoteHost,

42 rawQueryString, remoteHost,

46 requestHeaders, requestMethod,

43 requestHeaders, requestMethod,

47 responseLBS, vault)

44 responseLBS, vault)

45+import Prelude.Compat

48import Web.HttpApiData (FromHttpApiData)

46import Web.HttpApiData (FromHttpApiData)

49import Web.HttpApiData.Internal (parseHeaderMaybe,

47import Web.HttpApiData.Internal (parseHeaderMaybe,

50 parseQueryParamMaybe,

48 parseQueryParamMaybe,

servant-server/src/Servant/Server/Internal/Enter.hs+2−3

@@ -10,9 +10,6 @@

10{-# LANGUAGE UndecidableInstances #-}

11module Servant.Server.Internal.Enter where

12

13−#if !MIN_VERSION_base(4,8,0)

14−import Control.Applicative

15−#endif

16import qualified Control.Category as C

13import qualified Control.Category as C

17#if MIN_VERSION_mtl(2,2,1)

14#if MIN_VERSION_mtl(2,2,1)

18import Control.Monad.Except

15import Control.Monad.Except

@@ -25,6 +22,8 @@ import qualified Control.Monad.State.Strict as SState

25import qualified Control.Monad.Writer.Lazy as LWriter

22import qualified Control.Monad.Writer.Lazy as LWriter

26import qualified Control.Monad.Writer.Strict as SWriter

23import qualified Control.Monad.Writer.Strict as SWriter

27import Data.Typeable

24import Data.Typeable

25+import Prelude.Compat

26+

28import Servant.API

27import Servant.API

29

28

30class Enter typ arg ret | typ arg -> ret, typ ret -> arg where

29class Enter typ arg ret | typ arg -> ret, typ ret -> arg where

servant-server/src/Servant/Server/Internal/RoutingApplication.hs+1−3

@@ -8,12 +8,10 @@

8{-# LANGUAGE StandaloneDeriving #-}

9module Servant.Server.Internal.RoutingApplication where

10

11−#if !MIN_VERSION_base(4,8,0)

12−import Control.Applicative ((<$>))

13−#endif

14import Control.Monad.Trans.Except (ExceptT, runExceptT)

11import Control.Monad.Trans.Except (ExceptT, runExceptT)

15import Network.Wai (Application, Request,

12import Network.Wai (Application, Request,

16 Response, ResponseReceived)

13 Response, ResponseReceived)

14+import Prelude.Compat

17import Servant.Server.Internal.ServantErr

15import Servant.Server.Internal.ServantErr

18

16

19type RoutingApplication =

17type RoutingApplication =

servant/servant.cabal+1−1

@@ -47,7 +47,7 @@ library

47 Servant.Utils.Links

48 build-depends:

49 base >=4.7 && <5

50− , base-compat >= 0.8

50+ , base-compat >= 0.9

51 , aeson >= 0.7

52 , attoparsec >= 0.12

53 , bytestring == 0.10.*

stack.yaml+1

@@ -14,6 +14,7 @@ packages:

14- servant-mock/

15- servant-server/

16extra-deps:

17+- base-compat-0.9.0

17- engine-io-wai-1.0.2

18- engine-io-wai-1.0.2

18- control-monad-omega-0.3.1

19- control-monad-omega-0.3.1

19- should-not-typecheck-2.0.1

20- should-not-typecheck-2.0.1