Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Added network-uri flag.

Browse source 
This addresses the split of network and network-uri.
This commit is contained in:
John MacFarlane 2014-08-20 15:34:13 -07:00
parent 13469af843
commit 604e1da878
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pandoc.cabal
View file

@ -201,6 +201,10 @@ Flag make-pandoc-man-pages
Description: Build program to regenerate pandoc man pages from README. Description: Build program to regenerate pandoc man pages from README.
Default: False Default: False
Flag network-uri
Description: Get Network.URI from the network-uri package
Default: True
Library Library
Build-Depends: base >= 4.2 && <5, Build-Depends: base >= 4.2 && <5,
syb >= 0.1 && < 0.5, syb >= 0.1 && < 0.5,
@ -209,7 +213,6 @@ Library
array >= 0.3 && < 0.6, array >= 0.3 && < 0.6,
parsec >= 3.1 && < 3.2, parsec >= 3.1 && < 3.2,
mtl >= 1.1 && < 2.3, mtl >= 1.1 && < 2.3,
network >= 2 && < 2.6,
filepath >= 1.1 && < 1.4, filepath >= 1.1 && < 1.4,
process >= 1 && < 1.3, process >= 1 && < 1.3,
directory >= 1 && < 1.3, directory >= 1 && < 1.3,
@ -243,6 +246,10 @@ Library
old-time, old-time,
deepseq-generics >= 0.1 && < 0.2, deepseq-generics >= 0.1 && < 0.2,
JuicyPixels >= 3.1.6.1 && < 3.2 JuicyPixels >= 3.1.6.1 && < 3.2
if flag(network-uri)
Build-Depends: network-uri >= 2.6 && < 2.7, network >= 2.6
else
Build-Depends: network >= 2 && < 2.6
if flag(https) if flag(https)
Build-Depends: http-client >= 0.3.2 && < 0.4, Build-Depends: http-client >= 0.3.2 && < 0.4,
http-client-tls >= 0.2 && < 0.3, http-client-tls >= 0.2 && < 0.3,
@ -339,7 +346,6 @@ Executable pandoc
base >= 4.2 && <5, base >= 4.2 && <5,
directory >= 1 && < 1.3, directory >= 1 && < 1.3,
filepath >= 1.1 && < 1.4, filepath >= 1.1 && < 1.4,
network >= 2 && < 2.6,
text >= 0.11 && < 1.2, text >= 0.11 && < 1.2,
bytestring >= 0.9 && < 0.11, bytestring >= 0.9 && < 0.11,
extensible-exceptions >= 0.1 && < 0.2, extensible-exceptions >= 0.1 && < 0.2,
@ -348,6 +354,10 @@ Executable pandoc
yaml >= 0.8.8.2 && < 0.9, yaml >= 0.8.8.2 && < 0.9,
containers >= 0.1 && < 0.6, containers >= 0.1 && < 0.6,
HTTP >= 4000.0.5 && < 4000.3 HTTP >= 4000.0.5 && < 4000.3
if flag(network-uri)
Build-Depends: network-uri >= 2.6 && < 2.7
else
Build-Depends: network >= 2 && < 2.6
Ghc-Options: -rtsopts -with-rtsopts=-K16m -Wall -fno-warn-unused-do-bind Ghc-Options: -rtsopts -with-rtsopts=-K16m -Wall -fno-warn-unused-do-bind
Ghc-Prof-Options: -auto-all -caf-all -rtsopts -with-rtsopts=-K16m Ghc-Prof-Options: -auto-all -caf-all -rtsopts -with-rtsopts=-K16m
if os(windows) if os(windows)