[arch-commits] Commit in haskell-trifecta/trunk (PKGBUILD haskell-trifecta.install)

Felix Yan fyan at archlinux.org
Wed May 25 10:18:26 UTC 2016


    Date: Wednesday, May 25, 2016 @ 12:18:26
  Author: fyan
Revision: 176832

upgpkg: haskell-trifecta 1.5.2-18

rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3-0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, texmath-0.8.6.3, wai-3.2.1.1

Modified:
  haskell-trifecta/trunk/PKGBUILD
Deleted:
  haskell-trifecta/trunk/haskell-trifecta.install

--------------------------+
 PKGBUILD                 |   16 ++++++++--------
 haskell-trifecta.install |   18 ------------------
 2 files changed, 8 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 10:15:49 UTC (rev 176831)
+++ PKGBUILD	2016-05-25 10:18:26 UTC (rev 176832)
@@ -5,24 +5,23 @@
 _hkgname=trifecta
 pkgname=haskell-trifecta
 pkgver=1.5.2
-pkgrel=17
+pkgrel=18
 pkgdesc="A modern parser combinator library with convenient diagnostics"
 url="http://github.com/ekmett/trifecta/"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-ansi-terminal" "haskell-ansi-wl-pprint" "haskell-blaze-builder"
+depends=("ghc=8.0.1" "haskell-ansi-terminal" "haskell-ansi-wl-pprint" "haskell-blaze-builder"
          "haskell-blaze-html" "haskell-blaze-markup" "haskell-charset" "haskell-comonad"
          "haskell-fingertree" "haskell-hashable" "haskell-lens" "haskell-mtl" "haskell-parsers"
          "haskell-profunctors" "haskell-reducers" "haskell-semigroups" "haskell-unordered-containers"
          "haskell-utf8-string")
-options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
 sha256sums=('ebc23319d2cfd39c87b2cf688f3db45528e371de9a417fc9e07e50a796b6503a')
 
 prepare() {
-    sed -i 's/comonad              >= 4       && < 5,/comonad              >= 4       \&\& < 6,/' \
-        ${_hkgname}-${pkgver}/${_hkgname}.cabal
+    sed -e 's/comonad              >= 4       && < 5,/comonad              >= 4       \&\& < 6,/' \
+        -e 's/transformers         >= 0.2     && < 0.5,/transformers         >= 0.2     \&\& < 0.6,/' \
+        -i ${_hkgname}-${pkgver}/${_hkgname}.cabal
 }
 
 build() {
@@ -35,6 +34,7 @@
     runhaskell Setup haddock --hoogle --html
     runhaskell Setup register --gen-script
     runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
     sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
@@ -41,8 +41,8 @@
 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 -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+    install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.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}"

Deleted: haskell-trifecta.install
===================================================================
--- haskell-trifecta.install	2016-05-25 10:15:49 UTC (rev 176831)
+++ haskell-trifecta.install	2016-05-25 10:18:26 UTC (rev 176832)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-trifecta
-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