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

[Felix Yan]

    Date: Tuesday, June 29, 2021 @ 02:27:07
  Author: felixonmars
Revision: 967819

upgpkg: haskell-mustache 2.3.1-334: rebuild with ghc 9.0.1

Added:
  haskell-mustache/trunk/ghc9.patch
Modified:
  haskell-mustache/trunk/PKGBUILD

------------+
 PKGBUILD   |   12 +++++++++---
 ghc9.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-29 01:25:43 UTC (rev 967818)
+++ PKGBUILD	2021-06-29 02:27:07 UTC (rev 967819)
@@ -3,7 +3,7 @@
 _hkgname=mustache
 pkgname=haskell-mustache
 pkgver=2.3.1
-pkgrel=333
+pkgrel=334
 pkgdesc="A mustache template parser library."
 url="https://github.com/JustusAdam/mustache"
 license=('BSD')
@@ -12,9 +12,15 @@
          'haskell-scientific' 'haskell-th-lift' 'haskell-cmdargs' 'haskell-yaml')
 makedepends=('ghc' 'haskell-hspec' 'haskell-base-unicode-symbols' 'haskell-wreq' 'haskell-zlib'
              'haskell-tar' 'haskell-lens' 'haskell-temporary')
-source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-sha512sums=('162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3')
+source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
+        ghc9.patch)
+sha512sums=('162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3'
+            'bb1a1df1ce2972998b65014a020dcab8467a89325a332df4b842881f11f3263f9720167c958b4164061443db44ea2bea82de07fcc57be90120e75d0eaca0c649')
 
+prepare() {
+    patch -d $_hkgname-$pkgver -p1 < ghc9.patch
+}
+
 build() {
     cd $_hkgname-$pkgver
     

Added: ghc9.patch
===================================================================
--- ghc9.patch	                        (rev 0)
+++ ghc9.patch	2021-06-29 02:27:07 UTC (rev 967819)
@@ -0,0 +1,40 @@
+diff --git a/src/Text/Mustache/Internal/Types.hs b/src/Text/Mustache/Internal/Types.hs
+index d824ba7..1552d09 100644
+--- a/src/Text/Mustache/Internal/Types.hs
++++ b/src/Text/Mustache/Internal/Types.hs
+@@ -24,7 +24,8 @@ import           Data.Text
+ import           Data.Text
+ import qualified Data.Text.Lazy           as LT
+ import qualified Data.Vector              as V
+-import           Language.Haskell.TH.Lift (Lift (lift), deriveLift)
++import           Language.Haskell.TH.Lift (deriveLift)
++import Language.Haskell.TH.Syntax
+
+
+ -- | Type of errors we may encounter during substitution.
+@@ -380,16 +381,20 @@ data Template = Template
+   , partials :: TemplateCache
+   } deriving (Show)
+
++
++deriveLift ''DataIdentifier
++deriveLift ''Node
++deriveLift ''Template
++
+ instance Lift TemplateCache where
++#if MIN_VERSION_template_haskell(2,16,0)
++  liftTyped m = [|| HM.fromList $$(liftTyped $ HM.toList m) ||]
++#else
+   lift m = [| HM.fromList $(lift $ HM.toList m) |]
++#endif
+
+ --Data.Text 1.2.4.0 introduces its own Lift Text instance
+ #if !MIN_VERSION_text(1,2,4)
+ instance Lift Text where
+   lift = lift . unpack
+ #endif
+-
+-deriveLift ''DataIdentifier
+-deriveLift ''Node
+-deriveLift ''Template
+-