Depend on OneTuple conditionally

containers-tests/benchmarks/IntMap.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE BangPatterns #-}
 module Main where
 
@@ -9,7 +10,12 @@ import qualified Data.IntMap as M
 import qualified Data.IntMap.Strict as MS
 import qualified Data.IntSet as S
 import Data.Maybe (fromMaybe)
-import Data.Tuple.Solo (Solo (MkSolo), getSolo)
+#if __GLASGOW_HASKELL__ < 908
+import Data.Tuple.Solo
+#else
+import Data.Tuple
+#endif
+  (Solo(MkSolo), getSolo)
 import Data.Word (Word8)
 import System.Random (StdGen, mkStdGen, random, randoms)
 import Prelude hiding (lookup)

containers-tests/benchmarks/Map.hs

@@ -15,7 +15,12 @@ import Data.Map (alterF)
 import Data.Maybe (fromMaybe)
 import Data.Functor ((<$))
 import Data.Coerce
-import Data.Tuple.Solo (Solo (MkSolo), getSolo)
+#if __GLASGOW_HASKELL__ < 908
+import Data.Tuple.Solo
+#else
+import Data.Tuple
+#endif
+  (Solo(MkSolo), getSolo)
 import System.Random (StdGen, mkStdGen, random, randoms)
 import Prelude hiding (lookup)
 

containers-tests/containers-tests.cabal

@@ -54,21 +54,27 @@ common test-deps
   import: deps
   build-depends:
       containers-tests
-    , OneTuple
     , QuickCheck                  >=2.7.1
     , quickcheck-classes-base     >= 0.6.2.0 && < 0.7
     , tasty                       >= 1.5.4 && < 1.6
     , tasty-hunit
     , tasty-quickcheck            >= 0.11.1 && < 0.12
     , transformers
 
+  if impl(ghc < 9.8)
+    build-depends:
+        OneTuple >= 0.4.1 && < 0.5
+
 common benchmark-deps
   import: deps
   build-depends:
       containers-tests
-    , OneTuple
     , tasty-bench       >=0.3.1   && <0.5
 
+  if impl(ghc < 9.8)
+    build-depends:
+        OneTuple >= 0.4.1 && < 0.5
+
   -- Flags recommended by tasty-bench
   if impl(ghc >= 8.6)
     ghc-options:    -fproc-alignment=64

containers-tests/tests/intmap-strictness.hs

@@ -18,7 +18,12 @@ import Data.Ord (comparing)
 import Test.ChasingBottoms.IsBottom
 import Test.Tasty (TestTree, defaultMain, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
-import Data.Tuple.Solo (Solo (MkSolo), getSolo)
+#if __GLASGOW_HASKELL__ < 908
+import Data.Tuple.Solo
+#else
+import Data.Tuple
+#endif
+  (Solo(MkSolo), getSolo)
 import Test.QuickCheck
 import Test.QuickCheck.Poly (A, B, C)
 import Test.QuickCheck.Function (apply)

containers-tests/tests/map-strictness.hs

@@ -16,7 +16,12 @@ import qualified Data.List.NonEmpty as NE
 import Data.Ord (Down(..), comparing)
 import Data.Maybe (catMaybes, mapMaybe)
 import Data.Semigroup (Arg(..))
-import Data.Tuple.Solo (Solo (MkSolo), getSolo)
+#if __GLASGOW_HASKELL__ < 908
+import Data.Tuple.Solo
+#else
+import Data.Tuple
+#endif
+  (Solo(MkSolo), getSolo)
 import Test.ChasingBottoms.IsBottom (bottom, isBottom)
 import Test.Tasty (TestTree, defaultMain, testGroup)
 import Test.Tasty.QuickCheck (testProperty)