git.iko.soy/typeable/servant
on master help sign in
Support http-api-data-0.3
f44b336Oleg Grenrus
servant-client/servant-client.cabal+1−1
compare with master
unifiedsplit
@@ -41,7 +41,7 @@ library
41 , base64-bytestring >= 1.0.0.1 && < 1.1
41 , base64-bytestring >= 1.0.0.1 && < 1.1
42 , bytestring >= 0.10 && < 0.11
42 , bytestring >= 0.10 && < 0.11
43 , exceptions >= 0.8 && < 0.9
43 , exceptions >= 0.8 && < 0.9
44− , http-api-data >= 0.1 && < 0.3
44+ , http-api-data >= 0.1 && < 0.4
45 , http-client >= 0.4.18.1 && < 0.6
45 , http-client >= 0.4.18.1 && < 0.6
46 , http-client-tls >= 0.2.2 && < 0.4
46 , http-client-tls >= 0.2.2 && < 0.4
47 , http-media >= 0.6.2 && < 0.7
47 , http-media >= 0.6.2 && < 0.7
servant-server/servant-server.cabal+1−1
@@ -52,7 +52,7 @@ library
52 , base64-bytestring >= 1.0 && < 1.1
52 , base64-bytestring >= 1.0 && < 1.1
53 , bytestring >= 0.10 && < 0.11
53 , bytestring >= 0.10 && < 0.11
54 , containers >= 0.5 && < 0.6
54 , containers >= 0.5 && < 0.6
55− , http-api-data >= 0.1 && < 0.3
55+ , http-api-data >= 0.1 && < 0.4
56 , http-types >= 0.8 && < 0.10
56 , http-types >= 0.8 && < 0.10
57 , network-uri >= 2.6 && < 2.7
57 , network-uri >= 2.6 && < 2.7
58 , mtl >= 2 && < 2.3
58 , mtl >= 2 && < 2.3
servant-server/src/Servant/Server/Internal.hs+7
@@ -43,10 +43,17 @@ import Network.Wai (Application, Request, Response,
43import Prelude ()
43import Prelude ()
44import Prelude.Compat
44import Prelude.Compat
45import Web.HttpApiData (FromHttpApiData)
45import Web.HttpApiData (FromHttpApiData)
46+#if MIN_VERSION_http_api_data(0,3,0)
47+import Web.Internal.HttpApiData (parseHeaderMaybe,
48+ parseQueryParamMaybe,
49+ parseUrlPieceMaybe,
50+ parseUrlPieces)
51+#else
46import Web.HttpApiData.Internal (parseHeaderMaybe,
52import Web.HttpApiData.Internal (parseHeaderMaybe,
47 parseQueryParamMaybe,
53 parseQueryParamMaybe,
48 parseUrlPieceMaybe,
54 parseUrlPieceMaybe,
49 parseUrlPieces)
55 parseUrlPieces)
56+#endif
50
57
51import Servant.API ((:<|>) (..), (:>), BasicAuth, Capture,
58import Servant.API ((:<|>) (..), (:>), BasicAuth, Capture,
52 CaptureAll, Verb,
59 CaptureAll, Verb,
servant/servant.cabal+1−1
@@ -55,7 +55,7 @@ library
55 , attoparsec >= 0.12 && < 0.14
55 , attoparsec >= 0.12 && < 0.14
56 , bytestring >= 0.10 && < 0.11
56 , bytestring >= 0.10 && < 0.11
57 , case-insensitive >= 1.2 && < 1.3
57 , case-insensitive >= 1.2 && < 1.3
58− , http-api-data >= 0.1 && < 0.3
58+ , http-api-data >= 0.1 && < 0.4
59 , http-media >= 0.4 && < 0.7
59 , http-media >= 0.4 && < 0.7
60 , http-types >= 0.8 && < 0.10
60 , http-types >= 0.8 && < 0.10
61 , mtl >= 2.0 && < 2.3
61 , mtl >= 2.0 && < 2.3
stack.yaml+1
@@ -8,4 +8,5 @@ packages:
8- servant-server/
8- servant-server/
9- doc/tutorial
9- doc/tutorial
10extra-deps:
10extra-deps:
11+- http-api-data-0.3
11resolver: lts-6.0
12resolver: lts-6.0