Date: Friday, June 25, 2021 @ 02:57:31 Author: felixonmars Revision: 967301
upgpkg: haskell-yesod-core 1.6.20.1-11: rebuild with ghc 9.0.1 Added: haskell-yesod-core/trunk/ghc9.patch Modified: haskell-yesod-core/trunk/PKGBUILD ------------+ PKGBUILD | 13 ++++++++++--- ghc9.patch | 22 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-25 02:57:25 UTC (rev 967300) +++ PKGBUILD 2021-06-25 02:57:31 UTC (rev 967301) @@ -4,7 +4,7 @@ _hkgname=yesod-core pkgname=haskell-yesod-core pkgver=1.6.20.1 -pkgrel=10 +pkgrel=11 pkgdesc="Creation of type-safe, RESTful web applications." url="http://www.yesodweb.com/"; license=("MIT") @@ -18,9 +18,16 @@ 'haskell-unliftio' 'haskell-unordered-containers' 'haskell-vector' 'haskell-wai' 'haskell-wai-extra' 'haskell-wai-logger' 'haskell-warp' 'haskell-word8') makedepends=('ghc') -source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";) -sha512sums=('626cffc53ea4e9b8a425dd84571955e2efcbb99d8feebdfd54bcfa62933111c5ed1f0a8435968b816f2d0360392194de8040dd66dedbaae39a47171790da443e') +source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"; + ghc9.patch) +sha512sums=('626cffc53ea4e9b8a425dd84571955e2efcbb99d8feebdfd54bcfa62933111c5ed1f0a8435968b816f2d0360392194de8040dd66dedbaae39a47171790da443e' + 'c6d5e04f1883c01d3302e7fcb5a0465d9e4f65b51d5c19140a6e9f3bffafdf08cc098202ddea58d548095b9150344d0be61993d01aee7ffb882ac55a03cf104e') +prepare() { + cd $_hkgname-$pkgver + patch -p2 -i ../ghc9.patch +} + build() { cd $_hkgname-$pkgver Added: ghc9.patch =================================================================== --- ghc9.patch (rev 0) +++ ghc9.patch 2021-06-25 02:57:31 UTC (rev 967301) @@ -0,0 +1,22 @@ +commit a1e18c5b6832f30e0bb119406f0660863db40dd4 +Author: Felix Yan <[email protected]> +Date: Fri Jun 25 10:54:55 2021 +0800 + + Fix compatibility with template-haskell 2.17 + +diff --git a/yesod-core/src/Yesod/Core/Internal/TH.hs b/yesod-core/src/Yesod/Core/Internal/TH.hs +index f3505b91..11bbf90b 100644 +--- a/yesod-core/src/Yesod/Core/Internal/TH.hs ++++ b/yesod-core/src/Yesod/Core/Internal/TH.hs +@@ -107,9 +107,9 @@ mkYesodDispatch name = fmap snd . mkYesodWithParser name False return + -- | Get the Handler and Widget type synonyms for the given site. + masterTypeSyns :: [Name] -> Type -> [Dec] -- FIXME remove from here, put into the scaffolding itself? + masterTypeSyns vs site = +- [ TySynD (mkName "Handler") (fmap PlainTV vs) ++ [ TySynD (mkName "Handler") (fmap plainTV vs) + $ ConT ''HandlerFor `AppT` site +- , TySynD (mkName "Widget") (fmap PlainTV vs) ++ , TySynD (mkName "Widget") (fmap plainTV vs) + $ ConT ''WidgetFor `AppT` site `AppT` ConT ''() + ] +
