Merge pull request #547 from LaurentRDC/GHC-9-10-support

Support for GHC 9.10

.github/workflows/ci.yml

@@ -37,6 +37,8 @@ jobs:
           - "ARM64"
         ghc:
           - 'latest'
+          - '9.10'
+          - '9.8'
           - '9.6'
           - '9.4'
           - '9.2'

accelerate.cabal

@@ -334,7 +334,7 @@ flag nofib
 
 library
   build-depends:
-          base                          >= 4.12 && < 4.20
+          base                          >= 4.12 && < 4.21
         , ansi-terminal                 >= 0.6.2
         , base-orphans                  >= 0.3
         , bytestring                    >= 0.10.2
@@ -356,7 +356,7 @@ library
         , prettyprinter-ansi-terminal   >= 1.1.2
         , primitive                     >= 0.6.4
         , tasty                         >= 0.11
-        , template-haskell
+        , template-haskell              < 2.23
         , terminal-size                 >= 0.3
         , text                          >= 1.2.4
         , transformers                  >= 0.3

src/Data/Array/Accelerate/Pattern/TH.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP              #-}
 {-# LANGUAGE TemplateHaskell  #-}
 {-# LANGUAGE TypeApplications #-}
 -- |
@@ -181,7 +182,13 @@ mkConP tn' tvs' con' = do
                      ]
       r' <- case mf of
               Nothing -> return r
+-- Since template-haskell 2.22, NamespaceSpecifier has been added
+-- https://hackage.haskell.org/package/template-haskell-2.22.0.0/changelog
+#if MIN_VERSION_template_haskell(2,22,0)
+              Just f  -> return (InfixD f NoNamespaceSpecifier pat : r)
+#else
               Just f  -> return (InfixD f pat : r)
+#endif
       return (pat, r')
       where
         pat = mkName (':' : nameBase cn)
@@ -273,7 +280,13 @@ mkConS tn' tvs' prev' next' tag' con' = do
                      ]
       r' <- case mf of
               Nothing -> return r
+-- Since template-haskell 2.22, NamespaceSpecifier has been added
+-- https://hackage.haskell.org/package/template-haskell-2.22.0.0/changelog
+#if MIN_VERSION_template_haskell(2,22,0)
+              Just f  -> return (InfixD f NoNamespaceSpecifier pat : r)
+#else
               Just f  -> return (InfixD f pat : r)
+#endif
       return r'
       where
         sig = forallT

src/Data/BitSet.hs

@@ -14,7 +14,8 @@
 module Data.BitSet where
 
 import Data.Bits
-import Prelude                                            hiding ( foldl, foldr )
+-- foldl' is exported by Prelude from GHC 9.10
+import Prelude                                            hiding ( foldl, foldr, foldl' )
 import qualified Data.List                                as List
 
 import GHC.Exts                                           ( IsList, build )