From 0bfa06f2e191592f62c404eb886bb7f0c79b4bde Mon Sep 17 00:00:00 2001 From: kgtkr Date: Wed, 11 Sep 2024 15:09:23 +0900 Subject: [PATCH] support ghc9.8 --- extensible-skeleton/src/Data/Extensible/Effect/TH.hs | 12 +++++++++--- extensible.cabal | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/extensible-skeleton/src/Data/Extensible/Effect/TH.hs b/extensible-skeleton/src/Data/Extensible/Effect/TH.hs index adf7fef..c08af64 100644 --- a/extensible-skeleton/src/Data/Extensible/Effect/TH.hs +++ b/extensible-skeleton/src/Data/Extensible/Effect/TH.hs @@ -70,13 +70,17 @@ customDecEffects synSet synActions decs = decs >>= \ds -> fmap concat $ forM ds ++ concat dcs _ -> fail "mkEffects accepts GADT declaration" where -#if MIN_VERSION_template_haskell(2,17,0) +#if MIN_VERSION_template_haskell(2,21,0) + mkPlainTV n = PlainTV n BndrReq +#elif MIN_VERSION_template_haskell(2,17,0) mkPlainTV n = PlainTV n () #else mkPlainTV = PlainTV #endif -#if MIN_VERSION_template_haskell(2,17,0) +#if MIN_VERSION_template_haskell(2,21,0) +con2Eff :: [TyVarBndr BndrVis] -> Con -> Q ((Name, Type), [Dec]) +#elif MIN_VERSION_template_haskell(2,17,0) con2Eff :: [TyVarBndr ()] -> Con -> Q ((Name, Type), [Dec]) #else con2Eff :: [TyVarBndr] -> Con -> Q ((Name, Type), [Dec]) @@ -90,7 +94,9 @@ con2Eff _ p = do runIO (print p) fail "Unsupported constructor" -#if MIN_VERSION_template_haskell(2,17,0) +#if MIN_VERSION_template_haskell(2,21,0) +fromMangledGADT :: [TyVarBndr BndrVis] -> [Type] -> Name -> [(Strict, Type)] -> ((Name, Type), [Dec]) +#elif MIN_VERSION_template_haskell(2,17,0) fromMangledGADT :: [TyVarBndr ()] -> [Type] -> Name -> [(Strict, Type)] -> ((Name, Type), [Dec]) #else fromMangledGADT :: [TyVarBndr] -> [Type] -> Name -> [(Strict, Type)] -> ((Name, Type), [Dec]) diff --git a/extensible.cabal b/extensible.cabal index 2b0e5e4..9f536e9 100644 --- a/extensible.cabal +++ b/extensible.cabal @@ -80,7 +80,7 @@ library , CPP , NoStarIsType build-depends: base >= 4.8 && <5 - , aeson >= 1.5 && <2.2 + , aeson >= 1.5 && <2.3 , bytestring , comonad , constraints