Skip to content

Commit 7abe96c

Browse files
committed
Support GHC 9.12
1 parent e622a88 commit 7abe96c

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

haskell-src-meta/examples/HsHere.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ module HsHere
2020

2121
import qualified Control.Monad.Fail as Fail
2222
import Data.Generics (Data)
23-
import Data.Typeable (Typeable)
2423
import Language.Haskell.Meta (parseExp, parsePat)
2524
import Language.Haskell.Meta.Utils (cleanNames)
2625
import Language.Haskell.TH.Lib hiding (parensP)
@@ -42,7 +41,7 @@ data Here
4241
= CodeH Exp
4342
| TextH String
4443
| ManyH [Here]
45-
deriving (Eq,Show,Data,Typeable)
44+
deriving (Eq,Show,Data)
4645

4746
-- | Example:
4847
--

haskell-src-meta/examples/SKI.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ module SKI
2020

2121
import qualified Control.Monad.Fail as Fail
2222
import Data.Generics (Data)
23-
import Data.Typeable (Typeable)
2423
import Language.Haskell.Meta (parseExp, parsePat)
2524
import Language.Haskell.Meta.Utils (cleanNames, ppDoc, unsafeRunQ)
2625
import Language.Haskell.TH.Lib hiding (parensP)
@@ -40,7 +39,7 @@ quoteDecNotImplemented = fail . ("dec quoter not implemented: " ++ )
4039

4140

4241
data SKI = S | K | I | E Exp | SKI :$ SKI
43-
deriving (Eq,Data,Typeable)
42+
deriving (Eq,Data)
4443

4544
run :: String -> [SKI]
4645
run = fmap eval . fst . parse

haskell-src-meta/haskell-src-meta.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ library
2222
haskell-src-exts >= 1.21 && < 1.24,
2323
pretty >= 1.0 && < 1.2,
2424
syb >= 0.1 && < 0.8,
25-
template-haskell >= 2.12 && < 2.23,
25+
template-haskell >= 2.12 && < 2.24,
2626
th-orphans >= 0.12 && < 0.14
2727

2828
hs-source-dirs: src

haskell-src-meta/src/Language/Haskell/Meta/Extensions.hs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,14 @@ fromExtension e = case e of
374374
TH.ListTuplePuns -> Nothing
375375
#endif
376376

377+
-- 2.23.0 ---------------------------------------
378+
379+
#if MIN_VERSION_template_haskell(2,23,0)
380+
TH.MultilineStrings -> Nothing
381+
TH.NamedDefaults -> Nothing
382+
TH.OrPatterns -> Nothing
383+
#endif
384+
377385
-- NB: when adding a case here, you may also need to update `toExtension`
378386

379387

0 commit comments

Comments
 (0)