[arch-commits] Commit in haskell-bifunctors/repos (8 files)

Felix Yan fyan at archlinux.org
Wed Mar 2 04:46:50 UTC 2016


    Date: Wednesday, March 2, 2016 @ 05:46:49
  Author: fyan
Revision: 164043

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  haskell-bifunctors/repos/community-staging-i686/
  haskell-bifunctors/repos/community-staging-i686/PKGBUILD
    (from rev 164042, haskell-bifunctors/trunk/PKGBUILD)
  haskell-bifunctors/repos/community-staging-i686/haddock.patch
    (from rev 164042, haskell-bifunctors/trunk/haddock.patch)
  haskell-bifunctors/repos/community-staging-i686/haskell-bifunctors.install
    (from rev 164042, haskell-bifunctors/trunk/haskell-bifunctors.install)
  haskell-bifunctors/repos/community-staging-x86_64/
  haskell-bifunctors/repos/community-staging-x86_64/PKGBUILD
    (from rev 164042, haskell-bifunctors/trunk/PKGBUILD)
  haskell-bifunctors/repos/community-staging-x86_64/haddock.patch
    (from rev 164042, haskell-bifunctors/trunk/haddock.patch)
  haskell-bifunctors/repos/community-staging-x86_64/haskell-bifunctors.install
    (from rev 164042, haskell-bifunctors/trunk/haskell-bifunctors.install)

-----------------------------------------------------+
 community-staging-i686/PKGBUILD                     |   51 ++++++++++++++++++
 community-staging-i686/haddock.patch                |   32 +++++++++++
 community-staging-i686/haskell-bifunctors.install   |   18 ++++++
 community-staging-x86_64/PKGBUILD                   |   51 ++++++++++++++++++
 community-staging-x86_64/haddock.patch              |   32 +++++++++++
 community-staging-x86_64/haskell-bifunctors.install |   18 ++++++
 6 files changed, 202 insertions(+)

Copied: haskell-bifunctors/repos/community-staging-i686/PKGBUILD (from rev 164042, haskell-bifunctors/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2016-03-02 04:46:49 UTC (rev 164043)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=bifunctors
+pkgname=haskell-bifunctors
+pkgver=5.2.1
+pkgrel=5
+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")
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        haddock.patch)
+install="${pkgname}.install"
+sha256sums=('cbb459178a8c72cbb695361b518ae17ed3664e3ad207a34276f4d2990107e9cb'
+            '0a4647b1a75601c806c9b0b0e18814ea11cb87cc66a24ff6fe54ca260f20eb22')
+
+prepare() {
+    cd ${_hkgname}-${pkgver}
+    # https://github.com/ekmett/bifunctors/pull/41
+    patch -p1 -i ../haddock.patch
+}
+
+build() {
+    cd "${srcdir}/${_hkgname}-${pkgver}"
+    
+    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+        --libsubdir=\$compiler/site-local/\$pkgid \
+            -ftagged -fsemigroups
+    runhaskell Setup build
+    runhaskell Setup haddock --hoogle --html
+    runhaskell Setup register --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd "${srcdir}/${_hkgname}-${pkgver}"
+    
+    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/${pkgname}/register.sh"
+    install    -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh"
+    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+    ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: haskell-bifunctors/repos/community-staging-i686/haddock.patch (from rev 164042, haskell-bifunctors/trunk/haddock.patch)
===================================================================
--- community-staging-i686/haddock.patch	                        (rev 0)
+++ community-staging-i686/haddock.patch	2016-03-02 04:46:49 UTC (rev 164043)
@@ -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
+ 

Copied: haskell-bifunctors/repos/community-staging-i686/haskell-bifunctors.install (from rev 164042, haskell-bifunctors/trunk/haskell-bifunctors.install)
===================================================================
--- community-staging-i686/haskell-bifunctors.install	                        (rev 0)
+++ community-staging-i686/haskell-bifunctors.install	2016-03-02 04:46:49 UTC (rev 164043)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-bifunctors
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}

Copied: haskell-bifunctors/repos/community-staging-x86_64/PKGBUILD (from rev 164042, haskell-bifunctors/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2016-03-02 04:46:49 UTC (rev 164043)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=bifunctors
+pkgname=haskell-bifunctors
+pkgver=5.2.1
+pkgrel=5
+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")
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        haddock.patch)
+install="${pkgname}.install"
+sha256sums=('cbb459178a8c72cbb695361b518ae17ed3664e3ad207a34276f4d2990107e9cb'
+            '0a4647b1a75601c806c9b0b0e18814ea11cb87cc66a24ff6fe54ca260f20eb22')
+
+prepare() {
+    cd ${_hkgname}-${pkgver}
+    # https://github.com/ekmett/bifunctors/pull/41
+    patch -p1 -i ../haddock.patch
+}
+
+build() {
+    cd "${srcdir}/${_hkgname}-${pkgver}"
+    
+    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+        --libsubdir=\$compiler/site-local/\$pkgid \
+            -ftagged -fsemigroups
+    runhaskell Setup build
+    runhaskell Setup haddock --hoogle --html
+    runhaskell Setup register --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd "${srcdir}/${_hkgname}-${pkgver}"
+    
+    install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/${pkgname}/register.sh"
+    install    -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh"
+    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+    ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: haskell-bifunctors/repos/community-staging-x86_64/haddock.patch (from rev 164042, haskell-bifunctors/trunk/haddock.patch)
===================================================================
--- community-staging-x86_64/haddock.patch	                        (rev 0)
+++ community-staging-x86_64/haddock.patch	2016-03-02 04:46:49 UTC (rev 164043)
@@ -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
+ 

Copied: haskell-bifunctors/repos/community-staging-x86_64/haskell-bifunctors.install (from rev 164042, haskell-bifunctors/trunk/haskell-bifunctors.install)
===================================================================
--- community-staging-x86_64/haskell-bifunctors.install	                        (rev 0)
+++ community-staging-x86_64/haskell-bifunctors.install	2016-03-02 04:46:49 UTC (rev 164043)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-bifunctors
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}



More information about the arch-commits mailing list