summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorquchen <>2017-08-03 15:19:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-08-03 15:19:00 (GMT)
commit0e57f5d1f3ea97b8b7f6a93347900af2c72d3e3c (patch)
treef585ead6cd7e6d2f30525e4b1978a51daab0ca11
parente8499fe39f18a6448efd9ce6d8156679665145da (diff)
version 1.7.1.1HEAD1.7.1.1master
-rw-r--r--CHANGELOG.markdown5
-rw-r--r--src/Text/Trifecta/Instances.hs3
-rw-r--r--trifecta.cabal4
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 446d763..0cafec1 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,3 +1,8 @@
+1.7.1.1
+-------
+
+* Support `ansi-wl-pprint-0.6.8`
+
1.7.1
-----
* Support `doctest-0.12`
diff --git a/src/Text/Trifecta/Instances.hs b/src/Text/Trifecta/Instances.hs
index 2f6ad9c..980e6e7 100644
--- a/src/Text/Trifecta/Instances.hs
+++ b/src/Text/Trifecta/Instances.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
-----------------------------------------------------------------------------
-- |
@@ -12,8 +13,10 @@
-----------------------------------------------------------------------------
module Text.Trifecta.Instances () where
+#if !MIN_VERSION_ansi_wl_pprint(0,6,8)
import Text.PrettyPrint.ANSI.Leijen
import qualified Data.Semigroup as Data
instance Data.Semigroup Doc where
(<>) = (<>)
+#endif
diff --git a/trifecta.cabal b/trifecta.cabal
index 0df0c41..8dea585 100644
--- a/trifecta.cabal
+++ b/trifecta.cabal
@@ -1,6 +1,6 @@
name: trifecta
category: Text, Parsing, Diagnostics, Pretty Printer, Logging
-version: 1.7.1
+version: 1.7.1.1
license: BSD3
cabal-version: >= 1.10
license-file: LICENSE
@@ -96,7 +96,7 @@ test-suite doctests
default-language: Haskell2010
build-depends:
base,
- doctest >= 0.11.1 && < 0.13,
+ doctest >= 0.11.1 && < 0.14,
trifecta
test-suite quickcheck