diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-08-04 07:36:18 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-08-04 07:36:18 -0700 |
| commit | 4630cff2a6c116f1d474f459e6e759f5ce7f2003 (patch) | |
| tree | 5c52982b8f0615fadb69a0a105af9e1e60d51f25 /pandoc.cabal | |
| parent | 81335df9a51740631e75614c1279634f937d650a (diff) | |
| parent | cd9a5d90cbf93925db5bb9e9060ef40d05b4bfc8 (diff) | |
Merge branch 'epubend' of https://github.com/mpickering/pandoc into mpickering-epubend
Conflicts:
pandoc.cabal
Diffstat (limited to 'pandoc.cabal')
| -rw-r--r-- | pandoc.cabal | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index e507ac42f..d7bc5479e 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -227,11 +227,11 @@ Library old-locale >= 1 && < 1.1, time >= 1.2 && < 1.5, HTTP >= 4000.0.5 && < 4000.3, - texmath >= 0.6.6.3 && < 0.7, + texmath >= 0.7 && < 0.8, xml >= 1.3.12 && < 1.4, random >= 1 && < 1.1, extensible-exceptions >= 0.1 && < 0.2, - pandoc-types >= 1.12.3.3 && < 1.13, + pandoc-types >= 1.12.4 && < 1.13, aeson >= 0.7 && < 0.9, tagsoup >= 0.13.1 && < 0.14, base64-bytestring >= 0.1 && < 1.1, @@ -248,7 +248,8 @@ Library binary >= 0.5 && < 0.8, SHA >= 1.6 && < 1.7, haddock-library >= 1.1 && < 1.2, - old-time + old-time, + deepseq-generics >= 0.1 && < 0.2 if flag(https) Build-Depends: http-client >= 0.3.2 && < 0.4, http-client-tls >= 0.2 && < 0.3, @@ -287,6 +288,7 @@ Library Text.Pandoc.Readers.Native, Text.Pandoc.Readers.Haddock, Text.Pandoc.Readers.Docx, + Text.Pandoc.Readers.EPUB, Text.Pandoc.Writers.Native, Text.Pandoc.Writers.Docbook, Text.Pandoc.Writers.OPML, @@ -340,7 +342,7 @@ Library Executable pandoc Build-Depends: pandoc, - pandoc-types >= 1.12.3.3 && < 1.13, + pandoc-types >= 1.12.4 && < 1.13, base >= 4.2 && <5, directory >= 1 && < 1.3, filepath >= 1.1 && < 1.4, @@ -385,7 +387,7 @@ Test-Suite test-pandoc Build-Depends: base >= 4.2 && < 5, syb >= 0.1 && < 0.5, pandoc, - pandoc-types >= 1.12.3.3 && < 1.13, + pandoc-types >= 1.12.4 && < 1.13, bytestring >= 0.9 && < 0.11, text >= 0.11 && < 1.2, directory >= 1 && < 1.3, |