Date: Wednesday, May 25, 2016 @ 17:31:26 Author: fyan Revision: 176991
upgpkg: haskell-hakyll 4.8.3.1-3 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-hakyll/trunk/PKGBUILD Deleted: haskell-hakyll/trunk/haskell-hakyll.install ------------------------+ PKGBUILD | 19 +++++++++++++------ haskell-hakyll.install | 18 ------------------ 2 files changed, 13 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-25 15:30:39 UTC (rev 176990) +++ PKGBUILD 2016-05-25 15:31:26 UTC (rev 176991) @@ -5,12 +5,12 @@ _hkgname=hakyll pkgname=haskell-hakyll pkgver=4.8.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A static website compiler library" url="http://jaspervdj.be/hakyll"; license=("custom:BSD3") arch=('i686' 'x86_64') -depends=("ghc=7.10.3" "haskell-blaze-html" "haskell-blaze-markup" "haskell-cmdargs" +depends=("ghc=8.0.1" "haskell-blaze-html" "haskell-blaze-markup" "haskell-cmdargs" "haskell-cryptohash" "haskell-data-default" "haskell-http-conduit" "haskell-http-types" "haskell-lrucache" "haskell-mtl" "haskell-network" "haskell-network-uri" "haskell-pandoc" "haskell-pandoc-citeproc" @@ -18,11 +18,17 @@ "haskell-resourcet" "haskell-scientific" "haskell-tagsoup" "haskell-text" "haskell-time-locale-compat" "haskell-unordered-containers" "haskell-vector" "haskell-yaml") -options=('staticlibs') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";) -install="${pkgname}.install" sha256sums=('e56b4a1b73b5d1b394af9c9730a2baf6df93a8cfd72b0429af36253083fdfaa4') +prepare() { + sed -e 's/binary >= 0.5 && < 0.8,/binary >= 0.5 \&\& < 0.9,/' \ + -e 's/data-default >= 0.4 && < 0.7,/data-default >= 0.4 \&\& < 0.8,/' \ + -e 's/process >= 1.0 && < 1.3,/process >= 1.0 \&\& < 1.5,/' \ + -e 's/time >= 1.4 && < 1.6,/time >= 1.4 \&\& < 1.7,/' \ + -i ${_hkgname}-${pkgver}/${_hkgname}.cabal +} + build() { cd "${srcdir}/${_hkgname}-${pkgver}" @@ -34,6 +40,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 } @@ -40,8 +47,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-hakyll.install =================================================================== --- haskell-hakyll.install 2016-05-25 15:30:39 UTC (rev 176990) +++ haskell-hakyll.install 2016-05-25 15:31:26 UTC (rev 176991) @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hakyll -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) -}
