4a1ef0b · typeable/pandoc

git.iko.soy/typeable/pandoc

Revert "Remove http-client CPP conditionals."

This reverts commit 3f82471355286d33f2d73329c29a51c47bf76ad7. We might want to revert the requirement of http-client 0.5, as this is not yet in Stackage and that is starting to cause problems. I can't recall why it is there.

commit4a1ef0b51d234a876d0621c710413ebebff69239 authorJohn MacFarlane <jgm@berkeley.edu> dateThu 13 Oct 2016, 12:32 (10 years ago) parent79d8056

1 file changed+10−1

compare with master

unifiedsplit

src/Text/Pandoc/Shared.hs+10−1

src/Text/Pandoc/Shared.hs+10−1

@@ -153,7 +153,16 @@ import Paths_pandoc (getDataFileName)

153153#ifdef HTTP_CLIENT

154154import Network.HTTP.Client (httpLbs, responseBody, responseHeaders,

155155 Request(port,host))

156−import Network.HTTP.Client (parseRequest, newManager)

156+#if MIN_VERSION_http_client(0,4,30)

157+import Network.HTTP.Client (parseRequest)

158+#else

159+import Network.HTTP.Client (parseUrl)

160+#endif

161+#if MIN_VERSION_http_client(0,4,18)

162+import Network.HTTP.Client (newManager)

163+#else

164+import Network.HTTP.Client (withManager)

165+#endif

157166import Network.HTTP.Client.Internal (addProxy)

158167import Network.HTTP.Client.TLS (tlsManagerSettings)

159168import System.Environment (getEnv)