Remove network-uri flag and use 'Network.Socket'.
This removes a compiler warning. There is no need for the old network-uri flag, since network 2.6 was released in 2014.
This commit is contained in:
parent
76e52ed4b0
commit
06bcb7c872
4 changed files with 3 additions and 11 deletions
10
pandoc.cabal
10
pandoc.cabal
|
@ -335,10 +335,6 @@ flag trypandoc
|
||||||
Description: Build trypandoc cgi executable.
|
Description: Build trypandoc cgi executable.
|
||||||
Default: False
|
Default: False
|
||||||
|
|
||||||
flag network-uri
|
|
||||||
Description: Get Network.URI from the network-uri package
|
|
||||||
Default: True
|
|
||||||
|
|
||||||
custom-setup
|
custom-setup
|
||||||
setup-depends: base, Cabal >= 2.0
|
setup-depends: base, Cabal >= 2.0
|
||||||
|
|
||||||
|
@ -387,6 +383,8 @@ library
|
||||||
Glob >= 0.7 && < 0.10,
|
Glob >= 0.7 && < 0.10,
|
||||||
cmark-gfm >= 0.1.1 && < 0.2,
|
cmark-gfm >= 0.1.1 && < 0.2,
|
||||||
doctemplates >= 0.2.1 && < 0.3,
|
doctemplates >= 0.2.1 && < 0.3,
|
||||||
|
network-uri >= 2.6 && < 2.7,
|
||||||
|
network >= 2.6,
|
||||||
http-client >= 0.4.30 && < 0.6,
|
http-client >= 0.4.30 && < 0.6,
|
||||||
http-client-tls >= 0.2.4 && < 0.4,
|
http-client-tls >= 0.2.4 && < 0.4,
|
||||||
http-types >= 0.8 && < 0.13,
|
http-types >= 0.8 && < 0.13,
|
||||||
|
@ -401,10 +399,6 @@ library
|
||||||
cpp-options: -D_WINDOWS
|
cpp-options: -D_WINDOWS
|
||||||
else
|
else
|
||||||
build-depends: unix >= 2.4 && < 2.8
|
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)
|
if flag(embed_data_files)
|
||||||
cpp-options: -DEMBED_DATA_FILES
|
cpp-options: -DEMBED_DATA_FILES
|
||||||
build-depends: file-embed >= 0.0 && < 0.1
|
build-depends: file-embed >= 0.0 && < 0.1
|
||||||
|
|
|
@ -132,7 +132,7 @@ import Network.HTTP.Client.Internal (addProxy)
|
||||||
import Network.HTTP.Client.TLS (tlsManagerSettings)
|
import Network.HTTP.Client.TLS (tlsManagerSettings)
|
||||||
import System.Environment (getEnv)
|
import System.Environment (getEnv)
|
||||||
import Network.HTTP.Types.Header ( hContentType )
|
import Network.HTTP.Types.Header ( hContentType )
|
||||||
import Network (withSocketsDo)
|
import Network.Socket (withSocketsDo)
|
||||||
import Data.ByteString.Lazy (toChunks)
|
import Data.ByteString.Lazy (toChunks)
|
||||||
import qualified Control.Exception as E
|
import qualified Control.Exception as E
|
||||||
import qualified Data.Time.LocalTime as IO (getCurrentTimeZone)
|
import qualified Data.Time.LocalTime as IO (getCurrentTimeZone)
|
||||||
|
|
|
@ -2,7 +2,6 @@ flags:
|
||||||
pandoc:
|
pandoc:
|
||||||
trypandoc: false
|
trypandoc: false
|
||||||
embed_data_files: true
|
embed_data_files: true
|
||||||
network-uri: true
|
|
||||||
pandoc-citeproc:
|
pandoc-citeproc:
|
||||||
bibutils: true
|
bibutils: true
|
||||||
embed_data_files: true
|
embed_data_files: true
|
||||||
|
|
|
@ -2,7 +2,6 @@ flags:
|
||||||
pandoc:
|
pandoc:
|
||||||
trypandoc: false
|
trypandoc: false
|
||||||
embed_data_files: true
|
embed_data_files: true
|
||||||
network-uri: true
|
|
||||||
pandoc-citeproc:
|
pandoc-citeproc:
|
||||||
bibutils: true
|
bibutils: true
|
||||||
embed_data_files: true
|
embed_data_files: true
|
||||||
|
|
Loading…
Reference in a new issue