diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-05-18 22:04:39 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-05-18 22:07:00 -0700 |
| commit | ee8c8da8ccfc7e3eb33679fd8a3a465766f9d5f7 (patch) | |
| tree | 3687dc0f3e6e677808c9b2cade554d2f14f1d63a /pandoc.cabal | |
| parent | 0915967d840ad453027fb30a00b69401d3d8b50e (diff) | |
Removed dependency on conduit.
* http-conduit flag is now https.
* Instead of http-conduit, we depend on http-client and http-client-tls.
Diffstat (limited to 'pandoc.cabal')
| -rw-r--r-- | pandoc.cabal | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 6f12ec375..1741c59f6 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -196,8 +196,8 @@ Flag embed_data_files Description: Embed data files in binary for relocatable executable. Default: False -Flag http-conduit - Description: Enable downloading of resources over https. +Flag https + Description: Enable support for downloading of resources over https. Default: True Library @@ -239,10 +239,11 @@ Library hslua >= 0.3 && < 0.4, binary >= 0.5 && < 0.8 Build-Tools: alex, happy - if flag(http-conduit) - Build-Depends: http-conduit >= 1.9 && < 2.2, + if flag(https) + Build-Depends: http-client >= 0.3.2 && < 0.4, + http-client-tls >= 0.2 && < 0.3, http-types >= 0.8 && < 0.9 - cpp-options: -DHTTP_CONDUIT + cpp-options: -DHTTP_CLIENT if flag(embed_data_files) cpp-options: -DEMBED_DATA_FILES -- Build-Tools: hsb2hs -- not yet recognized by cabal |