From 1c2bba5050713ff5ae30d596817597f71ef37922 Mon Sep 17 00:00:00 2001
From: Michael Walker <mike@barrucadu.co.uk>
Date: Mon, 11 Sep 2023 19:44:55 +0100
Subject: [PATCH] Bump tasty upper bound to <1.6

---
 dejafu-tests/exe/MainBench.hs   | 7 ++++++-
 tasty-dejafu/CHANGELOG.rst      | 9 +++++++++
 tasty-dejafu/tasty-dejafu.cabal | 2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dejafu-tests/exe/MainBench.hs b/dejafu-tests/exe/MainBench.hs
index 1a27c9e..30032c6 100644
--- a/dejafu-tests/exe/MainBench.hs
+++ b/dejafu-tests/exe/MainBench.hs
@@ -15,7 +15,12 @@ main = C.defaultMain (T.foldTestTree mkBench mempty tests)
 
 -- | Turn a test tree into a list of benchmarks.
 mkBench :: T.TreeFold [C.Benchmark]
-#if MIN_VERSION_tasty(1,4,0)
+#if MIN_VERSION_tasty(1,5,0)
+mkBench = T.trivialFold
+  { T.foldSingle = \opts lbl t -> [C.bench lbl (benchTest opts t)]
+  , T.foldGroup = \_ lbl bs -> map (C.bgroup lbl) bs
+  }
+#elif MIN_VERSION_tasty(1,4,0)
 mkBench = T.trivialFold
   { T.foldSingle = \opts lbl t -> [C.bench lbl (benchTest opts t)]
   , T.foldGroup = \_ lbl bs -> [C.bgroup lbl bs]
diff --git a/tasty-dejafu/CHANGELOG.rst b/tasty-dejafu/CHANGELOG.rst
index 2ce8eae..7323c61 100644
--- a/tasty-dejafu/CHANGELOG.rst
+++ b/tasty-dejafu/CHANGELOG.rst
@@ -7,6 +7,15 @@ standard Haskell versioning scheme.
 .. _PVP: https://pvp.haskell.org/
 
 
+unreleased
+----------
+
+Miscellaneous
+~~~~~~~~~~~~~
+
+* The upper bound on :hackage:`tasty` is <1.6.
+
+
 2.1.0.0 (2022-08-31)
 --------------------
 
diff --git a/tasty-dejafu/tasty-dejafu.cabal b/tasty-dejafu/tasty-dejafu.cabal
index eabe396..0d84a27 100755
--- a/tasty-dejafu/tasty-dejafu.cabal
+++ b/tasty-dejafu/tasty-dejafu.cabal
@@ -40,6 +40,6 @@ library
                      , dejafu >=2.0  && <2.5
                      , random >=1.0  && <1.3
                      , tagged >=0.8  && <0.9
-                     , tasty  >=0.10 && <1.5
+                     , tasty  >=0.10 && <1.6
   -- hs-source-dirs:      
   default-language:    Haskell2010