[arch-commits] Commit in haskell-bencode/trunk (PKGBUILD ghc-8.8.patch)

[Felix Yan]

    Date: Wednesday, January 8, 2020 @ 17:55:41
  Author: felixonmars
Revision: 550330

upgpkg: haskell-bencode 0.6.0.0-21: rebuild with ghc 8.8.1

Added:
  haskell-bencode/trunk/ghc-8.8.patch
Modified:
  haskell-bencode/trunk/PKGBUILD

---------------+
 PKGBUILD      |   15 ++++++++++++---
 ghc-8.8.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-08 17:43:46 UTC (rev 550329)
+++ PKGBUILD	2020-01-08 17:55:41 UTC (rev 550330)
@@ -4,7 +4,7 @@
 _hkgname=bencode
 pkgname=haskell-bencode
 pkgver=0.6.0.0
-pkgrel=20
+pkgrel=21
 pkgdesc="Parser and printer for bencoded data."
 url="https://hackage.haskell.org/package/${_hkgname}"
 license=("BSD")
@@ -11,9 +11,18 @@
 arch=('x86_64')
 depends=('ghc-libs')
 makedepends=('ghc')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha512sums=('be05a5a086d095e8ed79318c7b0a6e5e29f2483f8c9cbfe768c339353d473f8eb5c3060aaed9d60675bdfd13686e02b2261939ca6d34cc9488318daf2cc664d1')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        ghc-8.8.patch)
+sha512sums=('be05a5a086d095e8ed79318c7b0a6e5e29f2483f8c9cbfe768c339353d473f8eb5c3060aaed9d60675bdfd13686e02b2261939ca6d34cc9488318daf2cc664d1'
+            'a1e2daff64d7e2d624df45630ac94d801b13b575a4c2dd6d20c08fec5e996203e08394e7a1da6dd8251a8a1ecbf378d2921973eff7cc0ca88aa93ebfcf175326')
 
+prepare() {
+    cd $_hkgname-$pkgver
+    patch -p1 -i ../ghc-8.8.patch
+
+    echo -e "import Distribution.Simple\nmain = defaultMain" > Setup.hs
+}
+
 build() {
     cd $_hkgname-$pkgver
     

Added: ghc-8.8.patch
===================================================================
--- ghc-8.8.patch	                        (rev 0)
+++ ghc-8.8.patch	2020-01-08 17:55:41 UTC (rev 550330)
@@ -0,0 +1,38 @@
+From 8de5d71748c70144acc93e56c0f86065638f92ca Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons at cryp.to>
+Date: Sat, 19 Oct 2019 16:13:18 +0200
+Subject: [PATCH] Support the new MonadFail class introduced by ghc-8.8.1.
+
+https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail
+---
+ bencode.cabal              | 2 ++
+ src/Data/BEncode/Parser.hs | 5 +++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/src/Data/BEncode/Parser.hs b/src/Data/BEncode/Parser.hs
+index 8e4cb0b..55a6160 100644
+--- a/src/Data/BEncode/Parser.hs
++++ b/src/Data/BEncode/Parser.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module      :  BParser
+@@ -27,6 +28,7 @@ module Data.BEncode.Parser {-#
+ 
+ import           Control.Applicative        hiding (optional)
+ import           Control.Monad
++import qualified Control.Monad.Fail         as Fail
+ import           Data.BEncode
+ import qualified Data.ByteString.Lazy.Char8 as L
+ import qualified Data.Map                   as Map
+@@ -61,6 +63,9 @@ instance Monad BParser where
+                                           Ok a b' -> runB (f a) b'
+                                           Error str -> Error str
+     return val = BParser $ Ok val
++#if MIN_VERSION_base(4,13,0)
++instance Fail.MonadFail BParser where
++#endif
+     fail str = BParser $ \_ -> Error str
+ 
+ instance Functor BParser where