[arch-commits] Commit in haskell-monad-journal/trunk (2 files)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 16:08:39
  Author: fyan
Revision: 176912

upgpkg: haskell-monad-journal 0.7.2-2

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-monad-journal/trunk/PKGBUILD
Deleted:
  haskell-monad-journal/trunk/haskell-monad-journal.install

-------------------------------+
 PKGBUILD                      |   11 +++++------
 haskell-monad-journal.install |   18 ------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 14:08:31 UTC (rev 176911)
+++ PKGBUILD	2016-05-25 14:08:39 UTC (rev 176912)
@@ -5,16 +5,14 @@
 _hkgname=monad-journal
 pkgname=haskell-monad-journal
 pkgver=0.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Pure logger typeclass and monad transformer"
 url="http://github.com/phaazon/monad-journal"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-either" "haskell-monad-control" "haskell-mtl"
+depends=("ghc=8.0.1" "haskell-either" "haskell-monad-control" "haskell-mtl"
          "haskell-transformers-base")
-options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
 sha256sums=('72b1a676bd994198544c4861a05b1d1b4f7ae55ea35a837cace539b8d6c69d08')
 
 build() {
@@ -27,6 +25,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
 }
 
@@ -33,8 +32,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-monad-journal.install
===================================================================
--- haskell-monad-journal.install	2016-05-25 14:08:31 UTC (rev 176911)
+++ haskell-monad-journal.install	2016-05-25 14:08:39 UTC (rev 176912)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-monad-journal
-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)
-}