diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2012-05-10 09:13:14 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2012-05-10 09:13:14 -0700 |
| commit | 858bf197fedd46101b3371cd91e505ff79080643 (patch) | |
| tree | d3b03893170aa5986676da4d08b390e514a2387c /pandoc.cabal | |
| parent | d63bfb4bc53d9a7e8271cb3e1dcadc6982c7973b (diff) | |
Revert "Removed blaze_html_05 flag -- require blaze >= 0.5 by default."
This reverts commit f67a80cea27286ba17b3696198602a6bbdae014d.
Diffstat (limited to 'pandoc.cabal')
| -rw-r--r-- | pandoc.cabal | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 2f56278e1..aafd78b0f 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -185,6 +185,9 @@ Flag library Flag tests Description: Build test-pandoc. Default: False +Flag blaze_html_0_5 + Description: Use blaze-html 0.5 and blaze-markup 0.5 + Default: False Library -- Note: the following is duplicated in all stanzas. @@ -192,8 +195,6 @@ Library -- BEGIN DUPLICATED SECTION Build-Depends: containers >= 0.1 && < 0.5, parsec >= 3.1 && < 3.2, - blaze-html >= 0.5 && < 0.6, - blaze-markup >= 0.5.1 && < 0.6, mtl >= 1.1 && < 2.2, network >= 2 && < 2.4, filepath >= 1.1 && < 1.4, @@ -217,6 +218,13 @@ Library zlib >= 0.5 && < 0.6, highlighting-kate >= 0.5.0.2 && < 0.6, temporary >= 1.1 && < 1.2 + if flag(blaze_html_0_5) + build-depends: + blaze-html >= 0.5 && < 0.6, + blaze-markup >= 0.5.1 && < 0.6 + else + build-depends: + blaze-html >= 0.4.3.0 && < 0.5 if impl(ghc >= 6.10) Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4 else @@ -291,8 +299,6 @@ Executable pandoc -- It needs to be duplicated because of the library & executable flags. -- BEGIN DUPLICATED SECTION Build-Depends: containers >= 0.1 && < 0.5, - blaze-html >= 0.5 && < 0.6, - blaze-markup >= 0.5.1 && < 0.6, parsec >= 3.1 && < 3.2, mtl >= 1.1 && < 2.2, network >= 2 && < 2.4, @@ -317,6 +323,13 @@ Executable pandoc zlib >= 0.5 && < 0.6, highlighting-kate >= 0.5.0.2 && < 0.6, temporary >= 1.1 && < 1.2 + if flag(blaze_html_0_5) + build-depends: + blaze-html >= 0.5 && < 0.6, + blaze-markup >= 0.5.1 && < 0.6 + else + build-depends: + blaze-html >= 0.4.3.0 && < 0.5 if impl(ghc >= 6.10) Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4 else @@ -350,8 +363,6 @@ Executable test-pandoc -- It needs to be duplicated because of the library & executable flags. -- BEGIN DUPLICATED SECTION Build-Depends: containers >= 0.1 && < 0.5, - blaze-html >= 0.5 && < 0.6, - blaze-markup >= 0.5.1 && < 0.6, parsec >= 3.1 && < 3.2, mtl >= 1.1 && < 2.2, network >= 2 && < 2.4, @@ -376,6 +387,13 @@ Executable test-pandoc zlib >= 0.5 && < 0.6, highlighting-kate >= 0.5.0.2 && < 0.6, temporary >= 1.1 && < 1.2 + if flag(blaze_html_0_5) + build-depends: + blaze-html >= 0.5 && < 0.6, + blaze-markup >= 0.5.1 && < 0.6 + else + build-depends: + blaze-html >= 0.4.3.0 && < 0.5 if impl(ghc >= 6.10) Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4 else |