Date: Tuesday, June 22, 2021 @ 02:05:46 Author: felixonmars Revision: 966703
upgpkg: haskell-ixset-typed 0.5-161: rebuild with ghc 9.0.1 Added: haskell-ixset-typed/trunk/ghc9.patch Modified: haskell-ixset-typed/trunk/PKGBUILD ------------+ PKGBUILD | 12 +++++++++--- ghc9.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-22 01:52:07 UTC (rev 966702) +++ PKGBUILD 2021-06-22 02:05:46 UTC (rev 966703) @@ -3,7 +3,7 @@ _hkgname=ixset-typed pkgname=haskell-ixset-typed pkgver=0.5 -pkgrel=160 +pkgrel=161 pkgdesc="Efficient relational queries on Haskell sets" url="https://hackage.haskell.org/package/${_hkgname}"; license=('BSD') @@ -11,9 +11,15 @@ depends=('ghc-libs' 'haskell-safecopy' 'haskell-syb') makedepends=('ghc' 'haskell-hunit' 'haskell-quickcheck' 'haskell-tasty' 'haskell-tasty-hunit' 'haskell-tasty-quickcheck') -source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -sha512sums=('0f25a540835805cdea68b46de5956afa887172cf16135f7d13e1c1f59e750652defae74d3ecebdacdb606ddf3bdc515c370e0b57f7ada21e3aa3f6e1b62fe582') +source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz + ghc9.patch) +sha512sums=('0f25a540835805cdea68b46de5956afa887172cf16135f7d13e1c1f59e750652defae74d3ecebdacdb606ddf3bdc515c370e0b57f7ada21e3aa3f6e1b62fe582' + '4febefe2d34337482033ad4bfb28ec037323b176127e4a015244d630f8c5071a685d967a633cf64016865b095eb8f473abd5ec829bdf51c431e00ccd478abb0a') +prepare() { + patch -d $_hkgname-$pkgver -p1 < ghc9.patch +} + build() { cd $_hkgname-$pkgver Added: ghc9.patch =================================================================== --- ghc9.patch (rev 0) +++ ghc9.patch 2021-06-22 02:05:46 UTC (rev 966703) @@ -0,0 +1,54 @@ +commit fb8a9ae632ae7685e7fe9e1f9024b22f2e980b4a +Author: Felix Yan <[email protected]> +Date: Tue Jun 22 09:59:29 2021 +0800 + + Add support for template-haskell 2.17 + +diff --git a/ixset-typed.cabal b/ixset-typed.cabal +index 458577b..43c784c 100644 +--- a/ixset-typed.cabal ++++ b/ixset-typed.cabal +@@ -38,7 +38,7 @@ library + deepseq >= 1.3 && < 2, + safecopy >= 0.8 && < 0.11, + syb >= 0.4 && < 1, +- template-haskell >= 2.8 && < 2.17 ++ template-haskell >= 2.8 && < 2.18 + + hs-source-dirs: src + exposed-modules: +diff --git a/src/Data/IxSet/Typed.hs b/src/Data/IxSet/Typed.hs +index 75be66d..fc628ea 100644 +--- a/src/Data/IxSet/Typed.hs ++++ b/src/Data/IxSet/Typed.hs +@@ -594,7 +594,13 @@ inferIxSet ixset typeName calName entryPoints + getCalType t' = error ("Unexpected type in getCalType: " ++ pprint t') + -} + mkEntryPoint n = (conE 'Ix) `appE` +- (sigE (varE 'Map.empty) (forallT binders (return context) $ ++ (sigE (varE 'Map.empty) (forallT ++#if MIN_VERSION_template_haskell(2,17,0) ++ (map (SpecifiedSpec <$) binders) ++#else ++ binders ++#endif ++ (return context) $ + appT (appT (conT ''Map) (conT n)) + (appT (conT ''Set) typeCon))) `appE` + (varE 'flattenWithCalcs `appE` varE calName) +@@ -610,9 +616,15 @@ inferIxSet ixset typeName calName entryPoints + return $ [i, ixType'] -- ++ d + _ -> error "IxSet.inferIxSet calInfo unexpected match" + ++#if MIN_VERSION_template_haskell(2,17,0) ++tyVarBndrToName :: TyVarBndr () -> Name ++tyVarBndrToName (PlainTV nm _) = nm ++tyVarBndrToName (KindedTV nm _ _) = nm ++#else + tyVarBndrToName :: TyVarBndr -> Name + tyVarBndrToName (PlainTV nm) = nm + tyVarBndrToName (KindedTV nm _) = nm ++#endif + + -- | Generically traverses the argument to find all occurences of + -- values of type @b@ and returns them as a list.
