[arch-commits] Commit in hopenpgp-tools/trunk (PKGBUILD ghc-8.4.patch)

[Felix Yan]

    Date: Saturday, May 26, 2018 @ 08:09:36
  Author: felixonmars
Revision: 330014

upgpkg: hopenpgp-tools 0.21.1-1

Modified:
  hopenpgp-tools/trunk/PKGBUILD
Deleted:
  hopenpgp-tools/trunk/ghc-8.4.patch

---------------+
 PKGBUILD      |   31 ++++++++++++-------------------
 ghc-8.4.patch |   17 -----------------
 2 files changed, 12 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-26 07:56:03 UTC (rev 330013)
+++ PKGBUILD	2018-05-26 08:09:36 UTC (rev 330014)
@@ -3,31 +3,24 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=hopenpgp-tools
-pkgver=0.21
-pkgrel=11
+pkgver=0.21.1
+pkgrel=1
 pkgdesc="hOpenPGP-based command-line tools"
 url="http://floss.scru.org/hopenpgp-tools"
 license=("AGPL3")
 arch=('x86_64')
-depends=('ghc-libs' 'haskell-aeson' 'haskell-ansi-wl-pprint' 'haskell-attoparsec'
-         'haskell-base16-bytestring' 'haskell-binary-conduit' 'haskell-conduit'
-         'haskell-conduit-extra' 'haskell-crypto-pubkey' 'haskell-cryptohash' 'haskell-errors'
-         'haskell-fgl' 'haskell-graphviz' 'haskell-hopenpgp' 'haskell-http-client'
-         'haskell-http-client-tls' 'haskell-http-types' 'haskell-ixset-typed' 'haskell-lens'
-         'haskell-monad-loops' 'haskell-openpgp-asciiarmor' 'haskell-optparse-applicative'
-         'haskell-prettyprinter' 'haskell-prettyprinter-ansi-terminal' 'haskell-resourcet'
-         'haskell-time-locale-compat' 'haskell-yaml')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-attoparsec' 'haskell-base16-bytestring'
+         'haskell-binary-conduit' 'haskell-conduit' 'haskell-conduit-extra' 'haskell-crypto-pubkey'
+         'haskell-cryptohash' 'haskell-errors' 'haskell-fgl' 'haskell-graphviz' 'haskell-hopenpgp'
+         'haskell-http-client' 'haskell-http-client-tls' 'haskell-http-types' 'haskell-ixset-typed'
+         'haskell-lens' 'haskell-monad-loops' 'haskell-openpgp-asciiarmor'
+         'haskell-optparse-applicative' 'haskell-prettyprinter'
+         'haskell-prettyprinter-ansi-terminal' 'haskell-prettyprinter-convert-ansi-wl-pprint'
+         'haskell-resourcet' 'haskell-time-locale-compat' 'haskell-yaml')
 makedepends=('alex' 'happy' 'ghc')
-source=(https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
-        ghc-8.4.patch)
-sha512sums=('bfea3b24fbf61ddf0da0b87728448d191921c662eead7f0de0383fc1c653d4a77a7c3babbfc55a5cb1ea7ef4215499654182622d7be98617c0b2f1d9d079f751'
-            '94810a884eef875fc61f8235e4fad6c1e67d267fe3edaad4968f52110ea732b8c911068cc324b92bbdb045bf7f527eb866485f7737bd876277fc3c1ce20db8f1')
+source=(https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha512sums=('0f079cdc3d99c5e2679810c38d57e40a045bf91c26fd734c50a7715f803efa9367d2ee389dd8362c1c1d00f75227370b481e9b1fb74ad41c8fb0fc51c5c71e38')
 
-prepare() {
-    cd $pkgname-$pkgver
-    patch -p1 -i ../ghc-8.4.patch
-}
-
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: ghc-8.4.patch
===================================================================
--- ghc-8.4.patch	2018-05-26 07:56:03 UTC (rev 330013)
+++ ghc-8.4.patch	2018-05-26 08:09:36 UTC (rev 330014)
@@ -1,17 +0,0 @@
-diff --git a/hokey.hs.orig b/hokey.hs
-index a78d5a2..b951fe1 100644
---- a/hokey.hs.orig
-+++ b/hokey.hs
-@@ -153,9 +153,11 @@ instance A.ToJSON b => A.ToJSON (FakeMap Text b) where
-     toJSON = A.toJSON . Map.fromList . unFakeMap
- instance A.ToJSON RevocationStatus
- 
-+instance Semigroup UIDReport where
-+    (<>) (UIDReport a b c d e) (UIDReport a' b' c' d' e') = UIDReport (a <> a') (b <> b') (c <> c') (d <> d') (e <> e')
-+
- instance Monoid UIDReport where
-     mempty = UIDReport [] [] [] [] []
--    mappend (UIDReport a b c d e) (UIDReport a' b' c' d' e') = UIDReport (a <> a') (b <> b') (c <> c') (d <> d') (e <> e')
- 
- checkKey :: Maybe POSIXTime -> TK -> KeyReport
- checkKey mpt key = (\x -> x { keyBestOf = populateBestOf x, keyHasEncryptionCapableSubkey = hasEncryptionCapableSubkey (concatMap skUsageFlags (keySubkeys x)) }) KeyReport {