From d414b2543a1686007e84c54bc711dff969dfb569 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 7 May 2017 12:49:25 +0200
Subject: 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.
---
 pandoc.cabal | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'pandoc.cabal')

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
-- 
cgit v1.2.3