diff options
| -rw-r--r-- | pandoc.cabal | 10 | ||||
| -rw-r--r-- | src/Text/Pandoc/Class.hs | 2 | ||||
| -rw-r--r-- | stack.lts9.yaml | 1 | ||||
| -rw-r--r-- | stack.yaml | 1 |
4 files changed, 3 insertions, 11 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 6d8060553..3ba24d7fc 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -335,10 +335,6 @@ flag trypandoc Description: Build trypandoc cgi executable. Default: False -flag network-uri - Description: Get Network.URI from the network-uri package - Default: True - custom-setup setup-depends: base, Cabal >= 2.0 @@ -387,6 +383,8 @@ library Glob >= 0.7 && < 0.10, cmark-gfm >= 0.1.1 && < 0.2, doctemplates >= 0.2.1 && < 0.3, + network-uri >= 2.6 && < 2.7, + network >= 2.6, http-client >= 0.4.30 && < 0.6, http-client-tls >= 0.2.4 && < 0.4, http-types >= 0.8 && < 0.13, @@ -401,10 +399,6 @@ library cpp-options: -D_WINDOWS else build-depends: unix >= 2.4 && < 2.8 - if flag(network-uri) - build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6 - else - build-depends: network >= 2 && < 2.6 if flag(embed_data_files) cpp-options: -DEMBED_DATA_FILES build-depends: file-embed >= 0.0 && < 0.1 diff --git a/src/Text/Pandoc/Class.hs b/src/Text/Pandoc/Class.hs index 4ade2dc6d..657a48d75 100644 --- a/src/Text/Pandoc/Class.hs +++ b/src/Text/Pandoc/Class.hs @@ -132,7 +132,7 @@ import Network.HTTP.Client.Internal (addProxy) import Network.HTTP.Client.TLS (tlsManagerSettings) import System.Environment (getEnv) import Network.HTTP.Types.Header ( hContentType ) -import Network (withSocketsDo) +import Network.Socket (withSocketsDo) import Data.ByteString.Lazy (toChunks) import qualified Control.Exception as E import qualified Data.Time.LocalTime as IO (getCurrentTimeZone) diff --git a/stack.lts9.yaml b/stack.lts9.yaml index dac7dc0e4..355254618 100644 --- a/stack.lts9.yaml +++ b/stack.lts9.yaml @@ -2,7 +2,6 @@ flags: pandoc: trypandoc: false embed_data_files: true - network-uri: true pandoc-citeproc: bibutils: true embed_data_files: true diff --git a/stack.yaml b/stack.yaml index fb80afde6..e0d7045c8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,7 +2,6 @@ flags: pandoc: trypandoc: false embed_data_files: true - network-uri: true pandoc-citeproc: bibutils: true embed_data_files: true |