Date: Sunday, January 2, 2022 @ 00:06:40 Author: felixonmars Revision: 1092045
upgpkg: haskell-hopenpgp 2.9.6-1: rebuild with hOpenPGP 2.9.6 Modified: haskell-hopenpgp/trunk/PKGBUILD Deleted: haskell-hopenpgp/trunk/ghc9.patch haskell-hopenpgp/trunk/hashable-1.3.4.patch ----------------------+ PKGBUILD | 27 ++++++++++++--------------- ghc9.patch | 13 ------------- hashable-1.3.4.patch | 23 ----------------------- 3 files changed, 12 insertions(+), 51 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-01 23:43:22 UTC (rev 1092044) +++ PKGBUILD 2022-01-02 00:06:40 UTC (rev 1092045) @@ -2,8 +2,8 @@ _hkgname=hOpenPGP pkgname=haskell-hopenpgp -pkgver=2.9.5 -pkgrel=209 +pkgver=2.9.6 +pkgrel=1 pkgdesc="Native Haskell implementation of OpenPGP (RFC4880)" url="http://floss.scru.org/hOpenPGP/" license=('MIT') @@ -17,24 +17,16 @@ 'haskell-openpgp-asciiarmor' 'haskell-prettyprinter' 'haskell-resourcet' 'haskell-split' 'haskell-time-locale-compat' 'haskell-unliftio-core' 'haskell-unordered-containers' 'haskell-zlib') -makedepends=('ghc') -source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz - ghc9.patch - hashable-1.3.4.patch) -sha512sums=('7e0ecc73054c5315093e7f64f92bc7c62a7f9ff1b2c985595db427a063460b3fc692343079676631987c9a651212d1d739289f9b1e2ecb1c086b2c9bd5a4ba0e' - '9a1cf92845c1120b006b39f31496af5badfc42eb460794d3bcf8ba393eb63e7989c1c3934179fd96b9b0a23d87b078412662ebbba0d7278240eba7fe0d48ce8e' - '71a712dc52d7d26896da4869a499e2eb6d2943f3848c374047f57241dbe200765a8cef809854f7b66bbf948f6f89839793ded3a8aa827b40920c818ba09d70bb') +makedepends=('ghc' 'haskell-quickcheck' 'haskell-quickcheck-instances' 'haskell-tasty' + 'haskell-tasty-hunit' 'haskell-tasty-quickcheck') +source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +sha512sums=('c9a833e9d56fa0d1ab87be54e3a7b23f4bb93f737ff74d4f99356fcd14ef54afea7db58d3a4b1fd4b382a23ab9153f95ceb4397f03a5c32e4e71355a9e46541c') -prepare() { - patch -d $_hkgname-$pkgver -p1 < ghc9.patch - patch -d $_hkgname-$pkgver -p1 < hashable-1.3.4.patch -} - build() { cd $_hkgname-$pkgver runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ - --prefix=/usr --docdir=/usr/share/doc/$pkgname \ + --prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \ --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid --ghc-option=-fllvm \ -fnetwork-uri runhaskell Setup build $MAKEFLAGS @@ -44,6 +36,11 @@ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } +check() { + cd $_hkgname-$pkgver + runhaskell Setup test --show-details=direct +} + package() { cd $_hkgname-$pkgver Deleted: ghc9.patch =================================================================== --- ghc9.patch 2022-01-01 23:43:22 UTC (rev 1092044) +++ ghc9.patch 2022-01-02 00:06:40 UTC (rev 1092045) @@ -1,13 +0,0 @@ -diff --git a/Codec/Encryption/OpenPGP/Types/Internal/Base.hs b/Codec/Encryption/OpenPGP/Types/Internal/Base.hs -index 861b7a5..f3dcc4a 100644 ---- a/Codec/Encryption/OpenPGP/Types/Internal/Base.hs -+++ b/Codec/Encryption/OpenPGP/Types/Internal/Base.hs -@@ -1003,7 +1003,8 @@ instance Pretty SigSubPacket where - - instance Hashable SigSubPacket - --$(ATH.deriveJSON ATH.defaultOptions ''SigSubPacket) -+instance A.ToJSON SigSubPacket -+instance A.FromJSON SigSubPacket - - $(makeLenses ''SigSubPacket) Deleted: hashable-1.3.4.patch =================================================================== --- hashable-1.3.4.patch 2022-01-01 23:43:22 UTC (rev 1092044) +++ hashable-1.3.4.patch 2022-01-02 00:06:40 UTC (rev 1092045) @@ -1,23 +0,0 @@ -diff --git a/Codec/Encryption/OpenPGP/Types/Internal/Base.hs b/Codec/Encryption/OpenPGP/Types/Internal/Base.hs -index f3dcc4a..e72b5a2 100644 ---- a/Codec/Encryption/OpenPGP/Types/Internal/Base.hs -+++ b/Codec/Encryption/OpenPGP/Types/Internal/Base.hs -@@ -2,6 +2,7 @@ - -- Copyright © 2012-2018 Clint Adams - -- This software is released under the terms of the Expat license. - -- (See the LICENSE file). -+{-# LANGUAGE CPP #-} - {-# LANGUAGE DataKinds #-} - {-# LANGUAGE DeriveDataTypeable #-} - {-# LANGUAGE DeriveGeneric #-} -@@ -671,8 +672,10 @@ instance FutureFlag FeatureFlag where - - instance Hashable FeatureFlag - -+#if !MIN_VERSION_hashable(1,3,4) - instance Hashable a => Hashable (Set a) where - hashWithSalt salt = hashWithSalt salt . Set.toList -+#endif - - instance Pretty FeatureFlag where - pretty ModificationDetection = pretty "modification-detection"