summaryrefslogtreecommitdiff
path: root/pandoc.cabal
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-10-14 09:09:10 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-10-14 09:09:10 -0700
commit82b3e0ab97a67188f0886dd6b758aa8d0ccd1064 (patch)
tree97ba94d90547b6e143031f35ae4c2bba294fe214 /pandoc.cabal
parent198862ee40702c8844e4d0503329b69a3062c49b (diff)
Use custom Prelude to avoid compiler warnings.
- The (non-exported) prelude is in prelude/Prelude.hs. - It exports Monoid and Applicative, like base 4.8 prelude, but works with older base versions. - It exports (<>) for mappend. - It hides 'catch' on older base versions. This allows us to remove many imports of Data.Monoid and Control.Applicative, and remove Text.Pandoc.Compat.Monoid. It should allow us to use -Wall again for ghc 7.10.
Diffstat (limited to 'pandoc.cabal')
-rw-r--r--pandoc.cabal12
1 files changed, 6 insertions, 6 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index 7f55d1650..2925296f3 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -310,7 +310,7 @@ Library
ScopedTypeVariables, GeneralizedNewtypeDeriving,
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
FlexibleInstances
- Hs-Source-Dirs: src
+ Hs-Source-Dirs: src, prelude
Exposed-Modules: Text.Pandoc,
Text.Pandoc.Options,
@@ -394,11 +394,11 @@ Library
Text.Pandoc.Slides,
Text.Pandoc.Highlighting,
Text.Pandoc.Compat.Locale,
- Text.Pandoc.Compat.Monoid,
Text.Pandoc.Compat.Except,
Text.Pandoc.Compat.TagSoupEntity,
Text.Pandoc.Compat.Directory
Paths_pandoc
+ Prelude
Buildable: True
@@ -429,13 +429,13 @@ Executable pandoc
ScopedTypeVariables, GeneralizedNewtypeDeriving,
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
FlexibleInstances
- Hs-Source-Dirs: .
+ Hs-Source-Dirs: ., prelude
Main-Is: pandoc.hs
Buildable: True
Executable trypandoc
Main-Is: trypandoc.hs
- Hs-Source-Dirs: trypandoc
+ Hs-Source-Dirs: trypandoc, prelude
default-language: Haskell2010
if flag(trypandoc)
Build-Depends: base, aeson, pandoc, highlighting-kate,
@@ -447,7 +447,7 @@ Executable trypandoc
Test-Suite test-pandoc
Type: exitcode-stdio-1.0
Main-Is: test-pandoc.hs
- Hs-Source-Dirs: tests
+ Hs-Source-Dirs: tests, prelude
Build-Depends: base >= 4.2 && < 5,
syb >= 0.1 && < 0.7,
pandoc,
@@ -498,7 +498,7 @@ Test-Suite test-pandoc
benchmark benchmark-pandoc
Type: exitcode-stdio-1.0
Main-Is: benchmark-pandoc.hs
- Hs-Source-Dirs: benchmark
+ Hs-Source-Dirs: benchmark, prelude
Build-Depends: pandoc,
base >= 4.2 && < 5,
syb >= 0.1 && < 0.7,