Skip to content

Commit a5fc477

Browse files
Add GHC 9.12 support to clash-testsuite
1 parent 5c6d8f1 commit a5fc477

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

tests/src/Test/Tasty/Program.hs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
Program's output and error streams are ignored.
5959
-}
6060

61+
{-# LANGUAGE CPP #-}
6162
{-# LANGUAGE DeriveFunctor #-}
6263
{-# LANGUAGE QuasiQuotes #-}
6364
{-# OPTIONS_GHC -fno-warn-unused-top-binds #-}
@@ -77,7 +78,9 @@ import qualified Clash.Util.Interpolate as I
7778
import qualified Data.List as List
7879

7980
import Control.Applicative ( Alternative (..) )
81+
#if __GLASGOW_HASKELL__ <= 910
8082
import Data.Typeable ( Typeable )
83+
#endif
8184
import Data.Maybe ( fromMaybe, isNothing, listToMaybe )
8285
import System.FilePath.Glob ( globDir1, compile )
8386
import System.FilePath.Posix ( getSearchPath )
@@ -136,7 +139,9 @@ data TestProgram =
136139
-- ^ Work directory
137140
[(String, String)]
138141
-- ^ Additional environment variables
139-
deriving (Typeable)
142+
#if __GLASGOW_HASKELL__ <= 910
143+
deriving Typeable
144+
#endif
140145

141146
data TestFailingProgram =
142147
TestFailingProgram
@@ -160,7 +165,9 @@ data TestFailingProgram =
160165
-- ^ Work directory
161166
[(String, String)]
162167
-- ^ Additional environment variables
163-
deriving (Typeable)
168+
#if __GLASGOW_HASKELL__ <= 910
169+
deriving Typeable
170+
#endif
164171

165172
testOutput
166173
:: PrintOutput

0 commit comments

Comments
 (0)