Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Remove http-client CPP conditionals."

Browse source 
This reverts commit 3f82471355.

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.
This commit is contained in:
John MacFarlane 2016-10-13 12:32:10 +02:00
parent 79d8056acf
commit 4a1ef0b51d
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Text/Pandoc/Shared.hs
View file

@ -153,7 +153,16 @@ import Paths_pandoc (getDataFileName)
#ifdef HTTP_CLIENT
import Network.HTTP.Client (httpLbs, responseBody, responseHeaders,
Request(port,host))
import Network.HTTP.Client (parseRequest, newManager)
#if MIN_VERSION_http_client(0,4,30)
import Network.HTTP.Client (parseRequest)
#else
import Network.HTTP.Client (parseUrl)
#endif
#if MIN_VERSION_http_client(0,4,18)
import Network.HTTP.Client (newManager)
#else
import Network.HTTP.Client (withManager)
#endif
import Network.HTTP.Client.Internal (addProxy)
import Network.HTTP.Client.TLS (tlsManagerSettings)
import System.Environment (getEnv)