Date: Thursday, June 17, 2021 @ 17:40:09 Author: felixonmars Revision: 964674
upgpkg: haskell-czipwith 1.0.1.3-5: rebuild with ghc 9.0.1 Added: haskell-czipwith/trunk/ghc9.patch Modified: haskell-czipwith/trunk/PKGBUILD ------------+ PKGBUILD | 12 +++++++-- ghc9.patch | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-17 17:30:43 UTC (rev 964673) +++ PKGBUILD 2021-06-17 17:40:09 UTC (rev 964674) @@ -3,7 +3,7 @@ _hkgname=czipwith pkgname=haskell-czipwith pkgver=1.0.1.3 -pkgrel=4 +pkgrel=5 pkgdesc="CZipWith class and deriving via TH" url="https://github.com/lspitzner/czipwith/"; license=("BSD") @@ -10,9 +10,15 @@ arch=('x86_64') depends=('ghc-libs') makedepends=('ghc') -source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz";) -sha256sums=('2dc48540e574ebc924fe13ca2b08be103d228fd42ef90db2896e3727eb0f6687') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz"; + ghc9.patch) +sha256sums=('2dc48540e574ebc924fe13ca2b08be103d228fd42ef90db2896e3727eb0f6687' + 'd9ed14f362bad5db6e9bf9fd9a6114c638f0ffcf1887dd7f0dfd104fb79d1698') +prepare() { + patch -d $_hkgname-$pkgver -p1 < ghc9.patch +} + build() { cd $_hkgname-$pkgver Added: ghc9.patch =================================================================== --- ghc9.patch (rev 0) +++ ghc9.patch 2021-06-17 17:40:09 UTC (rev 964674) @@ -0,0 +1,71 @@ +From b6245884ae83e00dd2b5261762549b37390179f8 Mon Sep 17 00:00:00 2001 +From: Tristan Seligmann <[email protected]> +Date: Sun, 7 Feb 2021 13:26:59 +0200 +Subject: [PATCH] Fix GHC 9 compatibility + +--- + czipwith.cabal | 4 ++-- + src/Data/CZipWith.hs | 15 +++++++++++++++ + 2 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/czipwith.cabal b/czipwith.cabal +index 116c120..d8a98a9 100644 +--- a/czipwith.cabal ++++ b/czipwith.cabal +@@ -27,8 +27,8 @@ library + -- other-modules: + -- other-extensions: + build-depends: +- { base >=4.11 && <4.15 +- , template-haskell >=2.9 && <2.17 ++ { base >=4.11 && <4.16 ++ , template-haskell >=2.9 && <2.18 + } + hs-source-dirs: src + default-language: Haskell2010 +diff --git a/src/Data/CZipWith.hs b/src/Data/CZipWith.hs +index dafdd8f..9993c04 100644 +--- a/src/Data/CZipWith.hs ++++ b/src/Data/CZipWith.hs +@@ -223,8 +223,13 @@ deriveCPointed name = do + ++ show con + ++ ")" + let tyvar = case _tyvarbnd of ++#if MIN_VERSION_template_haskell(2,17,0) ++ PlainTV n _ -> n ++ KindedTV n _ _ -> n ++#else + PlainTV n -> n + KindedTV n _ -> n ++#endif + let fQ = mkName "f" + let pats = [varP fQ] + let +@@ -310,8 +315,13 @@ deriveCZipWith name = do + ++ show con + ++ ")" + let tyvar = case tyvarbnd of ++#if MIN_VERSION_template_haskell(2,17,0) ++ PlainTV n _ -> n ++ KindedTV n _ _ -> n ++#else + PlainTV n -> n + KindedTV n _ -> n ++#endif + let fQ = mkName "f" + let indexTys = zip [1 ..] elemTys + let indexTysVars = indexTys <&> \(i :: Int, ty) -> +@@ -403,8 +413,13 @@ deriveCZipWithM name = do + ++ show con + ++ ")" + let tyvar = case tyvarbnd of ++#if MIN_VERSION_template_haskell(2,17,0) ++ PlainTV n _ -> n ++ KindedTV n _ _ -> n ++#else + PlainTV n -> n + KindedTV n _ -> n ++#endif + let fQ = mkName "f" + let indexTys = zip [1 ..] elemTys + let indexTysVars = indexTys <&> \(i :: Int, ty) ->
