diff options
| -rw-r--r-- | pandoc.cabal | 5 | ||||
| -rw-r--r-- | src/Text/Pandoc/Templates.hs | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 6d8b95fe3..d70bab35f 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -144,11 +144,12 @@ Library process >= 1, directory >= 1, bytestring >= 0.9, zip-archive >= 0.1.1.4, utf8-string >= 0.3, old-time >= 1, - HTTP >= 4000.0.5, texmath, xml >= 1.3.5 && < 1.4 + HTTP >= 4000.0.5, texmath, xml >= 1.3.5 && < 1.4, + extensible-exceptions if impl(ghc >= 6.10) Build-depends: base >= 4 && < 5, syb else - Build-depends: base >= 3 && < 4, extensible-exceptions + Build-depends: base >= 3 && < 4 if flag(highlighting) Build-depends: highlighting-kate >= 0.2.3 cpp-options: -D_HIGHLIGHTING diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs index b8d186759..c30af0bfc 100644 --- a/src/Text/Pandoc/Templates.hs +++ b/src/Text/Pandoc/Templates.hs @@ -76,13 +76,7 @@ import Text.PrettyPrint (text, Doc) import Text.XHtml (primHtml, Html) import Data.ByteString.Lazy.UTF8 (ByteString, fromString) import Text.Pandoc.Shared (readDataFile) --- Note: it would be simpler just to use Control.Exception.Extensible --- for all versions of base, but extensible-exceptions is not in debian. -#if MIN_VERSION_base(4,0,0) -import qualified Control.Exception as E (try, IOException) -#else import qualified Control.Exception.Extensible as E (try, IOException) -#endif -- | Get default template for the specified writer. getDefaultTemplate :: (Maybe FilePath) -- ^ User data directory to search first |