diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-09-26 15:32:54 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-09-26 15:32:54 -0700 |
| commit | 7b01edce056394c19efc92a3db46562982b5c36c (patch) | |
| tree | fb8eba96fd737dcb13ff548ad0fe9900bae0e427 | |
| parent | 89ab95b5fcef972d89c493f56e355c1e7f3cb3fb (diff) | |
| parent | 0fbe7df81877911000dff14ac493fd837f9eb718 (diff) | |
| download | pandoc-7b01edce056394c19efc92a3db46562982b5c36c.tar.gz | |
Merge branch 'master' of github.com:jgm/pandoc
| -rw-r--r-- | pandoc.cabal | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index e5cf07d3b..0e805d724 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -219,14 +219,14 @@ Library process >= 1 && < 1.3, directory >= 1 && < 1.3, bytestring >= 0.9 && < 0.11, - text >= 0.11 && < 1.2, + text >= 0.11 && < 1.3, zip-archive >= 0.2.3.4 && < 0.3, old-locale >= 1 && < 1.1, time >= 1.2 && < 1.5, HTTP >= 4000.0.5 && < 4000.3, texmath >= 0.8 && < 0.9, xml >= 1.3.12 && < 1.4, - random >= 1 && < 1.1, + random >= 1 && < 1.2, extensible-exceptions >= 0.1 && < 0.2, pandoc-types >= 1.12.4 && < 1.13, aeson >= 0.7 && < 0.9, @@ -253,7 +253,7 @@ Library else Build-Depends: network >= 2 && < 2.6 if flag(https) - Build-Depends: http-client >= 0.3.2 && < 0.4, + Build-Depends: http-client >= 0.3.2 && < 0.5, http-client-tls >= 0.2 && < 0.3, http-types >= 0.8 && < 0.9 cpp-options: -DHTTP_CLIENT @@ -348,7 +348,7 @@ Executable pandoc base >= 4.2 && <5, directory >= 1 && < 1.3, filepath >= 1.1 && < 1.4, - text >= 0.11 && < 1.2, + text >= 0.11 && < 1.3, bytestring >= 0.9 && < 0.11, extensible-exceptions >= 0.1 && < 0.2, highlighting-kate >= 0.5.8.5 && < 0.6, @@ -409,7 +409,7 @@ Test-Suite test-pandoc pandoc, pandoc-types >= 1.12.4 && < 1.13, bytestring >= 0.9 && < 0.11, - text >= 0.11 && < 1.2, + text >= 0.11 && < 1.3, directory >= 1 && < 1.3, filepath >= 1.1 && < 1.4, process >= 1 && < 1.3, |