Skip to content

Commit cabe7bf

Browse files
authored
Merge pull request #38 from kgtkr/ghc9.8
Support ghc9.8
2 parents 10eb819 + 0bfa06f commit cabe7bf

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

extensible-skeleton/src/Data/Extensible/Effect/TH.hs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,17 @@ customDecEffects synSet synActions decs = decs >>= \ds -> fmap concat $ forM ds
7070
++ concat dcs
7171
_ -> fail "mkEffects accepts GADT declaration"
7272
where
73-
#if MIN_VERSION_template_haskell(2,17,0)
73+
#if MIN_VERSION_template_haskell(2,21,0)
74+
mkPlainTV n = PlainTV n BndrReq
75+
#elif MIN_VERSION_template_haskell(2,17,0)
7476
mkPlainTV n = PlainTV n ()
7577
#else
7678
mkPlainTV = PlainTV
7779
#endif
7880

79-
#if MIN_VERSION_template_haskell(2,17,0)
81+
#if MIN_VERSION_template_haskell(2,21,0)
82+
con2Eff :: [TyVarBndr BndrVis] -> Con -> Q ((Name, Type), [Dec])
83+
#elif MIN_VERSION_template_haskell(2,17,0)
8084
con2Eff :: [TyVarBndr ()] -> Con -> Q ((Name, Type), [Dec])
8185
#else
8286
con2Eff :: [TyVarBndr] -> Con -> Q ((Name, Type), [Dec])
@@ -90,7 +94,9 @@ con2Eff _ p = do
9094
runIO (print p)
9195
fail "Unsupported constructor"
9296

93-
#if MIN_VERSION_template_haskell(2,17,0)
97+
#if MIN_VERSION_template_haskell(2,21,0)
98+
fromMangledGADT :: [TyVarBndr BndrVis] -> [Type] -> Name -> [(Strict, Type)] -> ((Name, Type), [Dec])
99+
#elif MIN_VERSION_template_haskell(2,17,0)
94100
fromMangledGADT :: [TyVarBndr ()] -> [Type] -> Name -> [(Strict, Type)] -> ((Name, Type), [Dec])
95101
#else
96102
fromMangledGADT :: [TyVarBndr] -> [Type] -> Name -> [(Strict, Type)] -> ((Name, Type), [Dec])

extensible.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ library
8080
, CPP
8181
, NoStarIsType
8282
build-depends: base >= 4.8 && <5
83-
, aeson >= 1.5 && <2.2
83+
, aeson >= 1.5 && <2.3
8484
, bytestring
8585
, comonad
8686
, constraints

0 commit comments

Comments
 (0)