[arch-commits] Commit in haskell-http-conduit/trunk (2 files)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 07:18:14
  Author: fyan
Revision: 176552

upgpkg: haskell-http-conduit 2.1.10.1-6

rebuild with MissingH-1.3.0.2, ShellCheck-0.4.4, cabal-helper-0.7.1.0, cryptohash-sha256-0.11.100.0, graphviz-2999.18.1.0, hakyll-4.8.3.1, idris-0.11.2, monad-journal-0.7.2, pandoc-crossref-0.2.1.3, simple-sendfile-0.2.22

Modified:
  haskell-http-conduit/trunk/PKGBUILD
Deleted:
  haskell-http-conduit/trunk/haskell-http-conduit.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 05:17:57 UTC (rev 176551)
+++ PKGBUILD	2016-05-25 05:18:14 UTC (rev 176552)
@@ -5,18 +5,16 @@
 _hkgname=http-conduit
 pkgname=haskell-http-conduit
 pkgver=2.1.10.1
-pkgrel=5
+pkgrel=6
 pkgdesc="HTTP client package with conduit interface and HTTPS support"
 url="http://www.yesodweb.com/book/http-conduit"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-aeson" "haskell-conduit" "haskell-conduit-extra"
+depends=("ghc=8.0.1" "haskell-aeson" "haskell-conduit" "haskell-conduit-extra"
          "haskell-data-default-class" "haskell-exceptions" "haskell-http-client"
          "haskell-http-client-tls" "haskell-http-types" "haskell-lifted-base"
          "haskell-monad-control" "haskell-mtl" "haskell-resourcet")
-options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
 sha256sums=('36ebae73f7bf984e1062aa6079b935069b49a5b3811ea935194c0cecb8de815f')
 
 build() {
@@ -29,6 +27,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
 }
 
@@ -35,8 +34,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-http-conduit.install
===================================================================
--- haskell-http-conduit.install	2016-05-25 05:17:57 UTC (rev 176551)
+++ haskell-http-conduit.install	2016-05-25 05:18:14 UTC (rev 176552)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-http-conduit
-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)
-}