Date: Monday, December 20, 2021 @ 01:27:00 Author: felixonmars Revision: 1079169
upgpkg: haskell-mustache 2.3.2-1: rebuild with mustache 2.3.2 Modified: haskell-mustache/trunk/PKGBUILD Deleted: haskell-mustache/trunk/ghc9.patch ------------+ PKGBUILD | 16 +++++----------- ghc9.patch | 40 ---------------------------------------- 2 files changed, 5 insertions(+), 51 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-20 01:25:05 UTC (rev 1079168) +++ PKGBUILD 2021-12-20 01:27:00 UTC (rev 1079169) @@ -2,25 +2,19 @@ _hkgname=mustache pkgname=haskell-mustache -pkgver=2.3.1 -pkgrel=393 +pkgver=2.3.2 +pkgrel=1 pkgdesc="A mustache template parser library." url="https://github.com/JustusAdam/mustache"; license=('BSD') arch=('x86_64') -depends=('ghc-libs' 'haskell-aeson' 'haskell-either' 'haskell-unordered-containers' 'haskell-vector' +depends=('ghc-libs' 'haskell-aeson' 'haskell-unordered-containers' 'haskell-vector' '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 - ghc9.patch) -sha512sums=('162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3' - 'bb1a1df1ce2972998b65014a020dcab8467a89325a332df4b842881f11f3263f9720167c958b4164061443db44ea2bea82de07fcc57be90120e75d0eaca0c649') +source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +sha512sums=('763ab60bfd99c08b21b291af6b4da17c9265c09659c1c1d14c0b5d5871583f28db5eca4385b66107ed7d9d9c547429a0bbc88048f28d1f6ee80c988cf63fff98') -prepare() { - patch -d $_hkgname-$pkgver -p1 < ghc9.patch -} - build() { cd $_hkgname-$pkgver Deleted: ghc9.patch =================================================================== --- ghc9.patch 2021-12-20 01:25:05 UTC (rev 1079168) +++ ghc9.patch 2021-12-20 01:27:00 UTC (rev 1079169) @@ -1,40 +0,0 @@ -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 --
