[arch-commits] Commit in haskell-yesod-core/trunk (PKGBUILD ghc9.patch)

[Felix Yan]

    Date: Sunday, July 4, 2021 @ 12:03:02
  Author: felixonmars
Revision: 972003

upgpkg: haskell-yesod-core 1.6.20.2-1: rebuild with yesod-core 1.6.20.2

Modified:
  haskell-yesod-core/trunk/PKGBUILD
Deleted:
  haskell-yesod-core/trunk/ghc9.patch

------------+
 PKGBUILD   |   15 ++++-----------
 ghc9.patch |   22 ----------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-04 09:48:36 UTC (rev 972002)
+++ PKGBUILD	2021-07-04 12:03:02 UTC (rev 972003)
@@ -3,8 +3,8 @@
 
 _hkgname=yesod-core
 pkgname=haskell-yesod-core
-pkgver=1.6.20.1
-pkgrel=13
+pkgver=1.6.20.2
+pkgrel=1
 pkgdesc="Creation of type-safe, RESTful web applications."
 url="http://www.yesodweb.com/"
 license=("MIT")
@@ -18,16 +18,9 @@
          '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"
-        ghc9.patch)
-sha512sums=('626cffc53ea4e9b8a425dd84571955e2efcbb99d8feebdfd54bcfa62933111c5ed1f0a8435968b816f2d0360392194de8040dd66dedbaae39a47171790da443e'
-            'c6d5e04f1883c01d3302e7fcb5a0465d9e4f65b51d5c19140a6e9f3bffafdf08cc098202ddea58d548095b9150344d0be61993d01aee7ffb882ac55a03cf104e')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+sha512sums=('4f0e318443e0a80b9e2f5c1cb13d80be69af5597e833c58e804fa3238a29db756c8ce1265c453af54deac98663f5967c12c9efe60efa9819d5d338f71dd2f172')
 
-prepare() {
-    cd $_hkgname-$pkgver
-    patch -p2 -i ../ghc9.patch
-}
-
 build() {
     cd $_hkgname-$pkgver
     

Deleted: ghc9.patch
===================================================================
--- ghc9.patch	2021-07-04 09:48:36 UTC (rev 972002)
+++ ghc9.patch	2021-07-04 12:03:02 UTC (rev 972003)
@@ -1,22 +0,0 @@
-commit a1e18c5b6832f30e0bb119406f0660863db40dd4
-Author: Felix Yan <felixonmars at archlinux.org>
-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 ''()
-     ]
-