06bcb7c · typeable/pandoc

git.iko.soy/typeable/pandoc

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.

commit06bcb7c87285afb130fd6271ab7df3baf81d38e9 authorJohn MacFarlane <jgm@berkeley.edu> dateThu 28 Jun 2018, 11:51 (8 years ago) parent76e52ed

4 files changed+3−11

compare with master

unifiedsplit

pandoc.cabal+2−8 src/Text/Pandoc/Class.hs+1−1 stack.lts9.yaml−1 stack.yaml−1

pandoc.cabal+2−8

@@ -335,10 +335,6 @@ flag trypandoc

335335 Description: Build trypandoc cgi executable.

336336 Default: False

337337

338−flag network-uri

339− Description: Get Network.URI from the network-uri package

340− Default: True

341−

342338custom-setup

343339 setup-depends: base, Cabal >= 2.0

344340

@@ -387,6 +383,8 @@ library

387383 Glob >= 0.7 && < 0.10,

388384 cmark-gfm >= 0.1.1 && < 0.2,

389385 doctemplates >= 0.2.1 && < 0.3,

386+ network-uri >= 2.6 && < 2.7,

387+ network >= 2.6,

390388 http-client >= 0.4.30 && < 0.6,

391389 http-client-tls >= 0.2.4 && < 0.4,

392390 http-types >= 0.8 && < 0.13,

@@ -401,10 +399,6 @@ library

401399 cpp-options: -D_WINDOWS

402400 else

403401 build-depends: unix >= 2.4 && < 2.8

404− if flag(network-uri)

405− build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6

406− else

407− build-depends: network >= 2 && < 2.6

408402 if flag(embed_data_files)

409403 cpp-options: -DEMBED_DATA_FILES

410404 build-depends: file-embed >= 0.0 && < 0.1

src/Text/Pandoc/Class.hs+1−1

@@ -132,7 +132,7 @@ import Network.HTTP.Client.Internal (addProxy)

132132import Network.HTTP.Client.TLS (tlsManagerSettings)

133133import System.Environment (getEnv)

134134import Network.HTTP.Types.Header ( hContentType )

135−import Network (withSocketsDo)

135+import Network.Socket (withSocketsDo)

136136import Data.ByteString.Lazy (toChunks)

137137import qualified Control.Exception as E

138138import qualified Data.Time.LocalTime as IO (getCurrentTimeZone)

stack.lts9.yaml−1

@@ -2,7 +2,6 @@ flags:

22 pandoc:

33 trypandoc: false

44 embed_data_files: true

5− network-uri: true

65 pandoc-citeproc:

76 bibutils: true

87 embed_data_files: true

stack.yaml−1