aboutsummaryrefslogtreecommitdiff
path: root/pandoc.cabal
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-05-07 12:49:25 +0200
committerJohn MacFarlane <jgm@berkeley.edu>2017-05-07 12:49:25 +0200
commitd414b2543a1686007e84c54bc711dff969dfb569 (patch)
tree038a81ac5d4d7393bda7b89779531767440942e0 /pandoc.cabal
parentf8e125f42d8568b9f2926c2d1a3eb37acba2b3d1 (diff)
downloadpandoc-d414b2543a1686007e84c54bc711dff969dfb569.tar.gz
Remove https flag.
Supporting two completely different libraries for fetching from URLs makes it difficult to trap errors, because of different error types expected from the libraries. There's no clear reason not to build with these https-capable libraires.
Diffstat (limited to 'pandoc.cabal')
-rw-r--r--pandoc.cabal14
1 files changed, 4 insertions, 10 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index f9ce1efd2..a713e9372 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -264,10 +264,6 @@ Flag weigh-pandoc
Description: Build weigh-pandoc to measure memory usage.
Default: False
-Flag https
- Description: Enable support for downloading of resources over https.
- Default: True
-
Flag network-uri
Description: Get Network.URI from the network-uri package
Default: True
@@ -316,7 +312,10 @@ Library
JuicyPixels >= 3.1.6.1 && < 3.3,
Glob >= 0.7 && < 0.8,
cmark >= 0.5 && < 0.6,
- doctemplates >= 0.1 && < 0.2
+ doctemplates >= 0.1 && < 0.2,
+ http-client >= 0.4.30 && < 0.6,
+ http-client-tls >= 0.2.4 && < 0.4,
+ http-types >= 0.8 && < 0.10
if os(windows)
Cpp-options: -D_WINDOWS
else
@@ -330,11 +329,6 @@ Library
Build-Depends: network-uri >= 2.6 && < 2.7, network >= 2.6
else
Build-Depends: network >= 2 && < 2.6
- if flag(https)
- Build-Depends: http-client >= 0.4.30 && < 0.6,
- http-client-tls >= 0.2.4 && < 0.4,
- http-types >= 0.8 && < 0.10
- cpp-options: -DHTTP_CLIENT
if flag(embed_data_files)
cpp-options: -DEMBED_DATA_FILES
build-depends: file-embed >= 0.0 && < 0.1