aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--pandoc.cabal10
-rw-r--r--src/Tests/Arbitrary.hs2
3 files changed, 7 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index cbb91ca96..df51012fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ README.*
INSTALL.*
.configure-stamp
man/man?/*.1
+man/man?/*.5
man/man?/*.html
*.diff
pandoc.cabal.orig
diff --git a/pandoc.cabal b/pandoc.cabal
index 757254c36..d033fa3a9 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -195,7 +195,7 @@ Library
mtl >= 1.1 && < 2.1,
network >= 2 && < 2.4,
filepath >= 1.1 && < 1.3,
- process >= 1 && < 1.1,
+ process >= 1 && < 1.2,
directory >= 1 && < 1.2,
bytestring >= 0.9 && < 1.0,
zip-archive >= 0.1.1.7 && < 0.2,
@@ -208,7 +208,7 @@ Library
extensible-exceptions >= 0.1 && < 0.2,
citeproc-hs >= 0.3.1 && < 0.4,
pandoc-types == 1.8.*,
- json >= 0.4 && < 0.5,
+ json >= 0.4 && < 0.6,
dlist >= 0.4 && < 0.6,
tagsoup >= 0.12 && < 0.13,
base64-bytestring >= 0.1 && < 0.2
@@ -281,7 +281,7 @@ Executable pandoc
mtl >= 1.1 && < 2.1,
network >= 2 && < 2.4,
filepath >= 1.1 && < 1.3,
- process >= 1 && < 1.1,
+ process >= 1 && < 1.2,
directory >= 1 && < 1.2,
bytestring >= 0.9 && < 1.0,
zip-archive >= 0.1.1.7 && < 0.2,
@@ -294,7 +294,7 @@ Executable pandoc
extensible-exceptions >= 0.1 && < 0.2,
citeproc-hs >= 0.3.1 && < 0.4,
pandoc-types == 1.8.*,
- json >= 0.4 && < 0.5,
+ json >= 0.4 && < 0.6,
dlist >= 0.4 && < 0.6,
tagsoup >= 0.12 && < 0.13,
base64-bytestring >= 0.1 && < 0.2
@@ -356,7 +356,7 @@ Executable test-pandoc
test-framework-quickcheck2 >= 0.2.9 && < 0.3,
QuickCheck >= 2.4 && < 2.6,
HUnit >= 1.2 && < 1.3,
- template-haskell >= 2.4 && < 2.6,
+ template-haskell >= 2.4 && < 2.7,
ansi-terminal == 0.5.*
Other-Modules: Tests.Old
Tests.Helpers
diff --git a/src/Tests/Arbitrary.hs b/src/Tests/Arbitrary.hs
index f5a44ceab..3ad90020d 100644
--- a/src/Tests/Arbitrary.hs
+++ b/src/Tests/Arbitrary.hs
@@ -1,5 +1,5 @@
{-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
-- provides Arbitrary instance for Pandoc types
module Tests.Arbitrary ()
where