From 216cf8d596b025bc3435196794fca1155e194226 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 30 Mar 2020 15:28:11 -0700
Subject: [PATCH] ;enable doctest with ghc 8.10

---
 hledger-lib/package.yaml | 7 +++----
 stack-8.0.yaml           | 2 +-
 stack-8.10.yaml          | 1 +
 stack-8.2.yaml           | 2 +-
 stack-8.4.yaml           | 1 +
 stack-8.6.yaml           | 1 +
 stack.yaml               | 1 +
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml
index 774b829b1..3f4822cee 100644
--- a/hledger-lib/package.yaml
+++ b/hledger-lib/package.yaml
@@ -176,8 +176,8 @@ tests:
     other-modules: []  # prevent double compilation, https://github.com/sol/hpack/issues/188
     dependencies:
     - Glob >=0.7
-    # Need a doctest new enough to support --fast and --verbose.
-    - doctest >=0.16
+    # Need a doctest new enough to support --fast and --verbose and ghc 8.10.
+    - doctest >=0.16.3
 
     # ghc 8.4+ on mac needs this workaround (see
     # https://github.com/sol/doctest/issues/199,
@@ -190,9 +190,8 @@ tests:
     # - condition: os(darwin) && impl(ghc >= 8.4)
     #   buildable: false
 
-    # ghc 8.10 isn't supported by doctest yet, https://github.com/sol/doctest/issues/246
     # ghc 8.0 on linux gives Hledger/Read/JournalReader.hs:126: failure in expression `rejp (journalp <* eof) "2015/1/1\n a  0\n"' ... Variable not in scope: rejp :: f0 a0 -> [Char] -> t
     # must use one conditional here, https://github.com/sol/hpack/issues/379
     when:
-    - condition: (impl(ghc < 8.2) || impl(ghc >= 8.10))
+    - condition: (impl(ghc < 8.2))
       buildable: false
diff --git a/stack-8.0.yaml b/stack-8.0.yaml
index ecc468834..d17f4d09c 100644
--- a/stack-8.0.yaml
+++ b/stack-8.0.yaml
@@ -27,7 +27,7 @@ extra-deps:
 - cassava-megaparsec-2.0.0
 - config-ini-0.2.3.0
 - criterion-1.4.1.0
-- doctest-0.16.0
+# - doctest-0.16.0
 - extra-1.6.17
 - fgl-5.5.4.0
 - generics-sop-0.3.2.0
diff --git a/stack-8.10.yaml b/stack-8.10.yaml
index 3df09d7a6..86117b397 100644
--- a/stack-8.10.yaml
+++ b/stack-8.10.yaml
@@ -68,6 +68,7 @@ packages:
 - hledger-web
 
 extra-deps:
+- doctest-0.16.3
 # for hledger-lib:
 # for hledger:
 # for hledger-ui:
diff --git a/stack-8.2.yaml b/stack-8.2.yaml
index d45f47f97..862b61791 100644
--- a/stack-8.2.yaml
+++ b/stack-8.2.yaml
@@ -24,7 +24,7 @@ extra-deps:
 - cassava-megaparsec-2.0.0
 - config-ini-0.2.3.0
 - criterion-1.4.1.0
-- doctest-0.16.0
+- doctest-0.16.3
 - megaparsec-7.0.1
 - parser-combinators-1.0.0
 - process-1.6.5.1
diff --git a/stack-8.4.yaml b/stack-8.4.yaml
index 54e57fa84..956428770 100644
--- a/stack-8.4.yaml
+++ b/stack-8.4.yaml
@@ -18,6 +18,7 @@ packages:
 extra-deps:
 - cassava-megaparsec-2.0.0
 - config-ini-0.2.3.0
+- doctest-0.16.3
 - megaparsec-7.0.2
 - tasty-1.2.3
 - tasty-hunit-0.10.0.2
diff --git a/stack-8.6.yaml b/stack-8.6.yaml
index d1951f340..c10b9f6d6 100644
--- a/stack-8.6.yaml
+++ b/stack-8.6.yaml
@@ -16,6 +16,7 @@ packages:
 - hledger-web
 
 extra-deps:
+- doctest-0.16.3
 # for Shake.hs (regex doesn't support base-compat-0.11):
 - regex-1.0.2.0@rev:1
 # for testing base-compat 0.11 compatibility (mutually exclusive with the above):
diff --git a/stack.yaml b/stack.yaml
index 4d6e90291..c8d78b845 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -16,6 +16,7 @@ packages:
 - hledger-web
 
 extra-deps:
+- doctest-0.16.3
 # for hledger-lib:
 # for hledger:
 # for hledger-ui: