diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-01-04 20:26:52 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-01-04 20:26:52 -0800 |
| commit | e2d86dfe286085cc33b513b17444e846fae0ce30 (patch) | |
| tree | 533008ff05af1546854623c9c6d145c901dbc441 /pandoc.cabal | |
| parent | 4866c905b0dbca5338c04b9cdcad20bc5846c710 (diff) | |
| parent | 9c68017786932e355461168d3ca0593e36d8d7f8 (diff) | |
| download | pandoc-e2d86dfe286085cc33b513b17444e846fae0ce30.tar.gz | |
Merge pull request #1856 from markwright/master
Allow compilation with ghc 7.10.1 RC1 and haddock-library 1.2
Diffstat (limited to 'pandoc.cabal')
| -rw-r--r-- | pandoc.cabal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 005f72344..a788a1c26 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -250,7 +250,7 @@ Library hslua >= 0.3 && < 0.4, binary >= 0.5 && < 0.8, SHA >= 1.6 && < 1.7, - haddock-library >= 1.1 && < 1.2, + haddock-library >= 1.1 && < 1.3, old-time, deepseq-generics >= 0.1 && < 0.2, JuicyPixels >= 3.1.6.1 && < 3.3 |