[arch-commits] Commit in haskell-bifunctors/trunk (PKGBUILD haddock.patch)

[Felix Yan]

    Date: Wednesday, January 27, 2016 @ 04:02:52
  Author: fyan
Revision: 159015

upgpkg: haskell-bifunctors 5.2.1-1

Added:
  haskell-bifunctors/trunk/haddock.patch
Modified:
  haskell-bifunctors/trunk/PKGBUILD

---------------+
 PKGBUILD      |   16 ++++++++++++----
 haddock.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-27 03:01:23 UTC (rev 159014)
+++ PKGBUILD	2016-01-27 03:02:52 UTC (rev 159015)
@@ -4,8 +4,8 @@
 
 _hkgname=bifunctors
 pkgname=haskell-bifunctors
-pkgver=5.2
-pkgrel=3
+pkgver=5.2.1
+pkgrel=1
 pkgdesc="Bifunctors"
 url="http://github.com/ekmett/bifunctors/"
 license=("custom:BSD3")
@@ -12,10 +12,18 @@
 arch=('i686' 'x86_64')
 depends=("ghc=7.10.3" "haskell-comonad" "haskell-semigroups" "haskell-tagged")
 options=('staticlibs')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        haddock.patch)
 install="${pkgname}.install"
-sha256sums=('46e173dac5863a7b8404b44ab1ead2de94e743d24a2de571ff086cfb8748de14')
+sha256sums=('cbb459178a8c72cbb695361b518ae17ed3664e3ad207a34276f4d2990107e9cb'
+            '0a4647b1a75601c806c9b0b0e18814ea11cb87cc66a24ff6fe54ca260f20eb22')
 
+prepare() {
+    cd ${_hkgname}-${pkgver}
+    # https://github.com/ekmett/bifunctors/pull/41
+    patch -p1 -i ../haddock.patch
+}
+
 build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
     

Added: haddock.patch
===================================================================
--- haddock.patch	                        (rev 0)
+++ haddock.patch	2016-01-27 03:02:52 UTC (rev 159015)
@@ -0,0 +1,32 @@
+From 00b941f126852754ecb4b4150829011f245347d5 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars at archlinux.org>
+Date: Wed, 27 Jan 2016 10:58:30 +0800
+Subject: [PATCH] Fix a haddock parse error
+
+Before the change, I am getting the following error when running haddock:
+
+```
+src/Data/Bifunctor/TH.hs:675:5:
+    parse error on input `-- * after substituting * for the dropped kind variables. If not, throw an error.'
+```
+
+Simply moving the first `*` to the end of previous line fixes this for me.
+---
+ src/Data/Bifunctor/TH.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Data/Bifunctor/TH.hs b/src/Data/Bifunctor/TH.hs
+index 7a39bda..31a898c 100644
+--- a/src/Data/Bifunctor/TH.hs
++++ b/src/Data/Bifunctor/TH.hs
+@@ -671,8 +671,8 @@ buildTypeInstanceFromTys biClass tyConName dataCxt varTysOrig isDataFamily = do
+         droppedTyVarNames :: [Name]
+         droppedTyVarNames = concatMap tyVarNamesOfType droppedTysExpSubst
+ 
+-    -- If any of the dropped types were polykinded, ensure that there are of kind
+-    -- * after substituting * for the dropped kind variables. If not, throw an error.
++    -- If any of the dropped types were polykinded, ensure that there are of kind *
++    -- after substituting * for the dropped kind variables. If not, throw an error.
+     unless (all hasKindStar droppedTysExpSubst) $
+       derivingKindError biClass tyConName
+