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

[Felix Yan]

    Date: Saturday, April 9, 2016 @ 18:02:56
  Author: fyan
Revision: 169912

upgpkg: haskell-bifunctors 5.3-1

rebuild with bifunctors-5.3, clock-0.7.1.1, cryptonite-0.14, fast-logger-2.4.2, hpack-0.12.0, http2-1.6.0, js-jquery-1.12.3, memory-0.12, monad-control-1.0.1.0, stack-1.0.4.3, tls-1.3.5, warp-3.2.6, xml-conduit-1.3.4.1, zip-archive-0.3.0.2

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

---------------+
 PKGBUILD      |   18 +++++-------------
 haddock.patch |   32 --------------------------------
 2 files changed, 5 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-09 15:40:03 UTC (rev 169911)
+++ PKGBUILD	2016-04-09 16:02:56 UTC (rev 169912)
@@ -4,26 +4,18 @@
 
 _hkgname=bifunctors
 pkgname=haskell-bifunctors
-pkgver=5.2.1
-pkgrel=6
+pkgver=5.3
+pkgrel=1
 pkgdesc="Bifunctors"
 url="http://github.com/ekmett/bifunctors/"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-comonad" "haskell-semigroups" "haskell-tagged")
+depends=("ghc=7.10.3" "haskell-base-orphans" "haskell-comonad" "haskell-semigroups" "haskell-tagged")
 options=('staticlibs')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
-        haddock.patch)
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install="${pkgname}.install"
-sha256sums=('cbb459178a8c72cbb695361b518ae17ed3664e3ad207a34276f4d2990107e9cb'
-            '0a4647b1a75601c806c9b0b0e18814ea11cb87cc66a24ff6fe54ca260f20eb22')
+sha256sums=('66d2faa673752b4e47018a9ebfd84075c450b41556bb9551cf04d359dbcce8bf')
 
-prepare() {
-    cd ${_hkgname}-${pkgver}
-    # https://github.com/ekmett/bifunctors/pull/41
-    patch -p1 -i ../haddock.patch
-}
-
 build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
     

Deleted: haddock.patch
===================================================================
--- haddock.patch	2016-04-09 15:40:03 UTC (rev 169911)
+++ haddock.patch	2016-04-09 16:02:56 UTC (rev 169912)
@@ -1,32 +0,0 @@
-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
-