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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 15:58:06
  Author: fyan
Revision: 176890

upgpkg: haskell-aws 0.13.0-44

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

---------------------+
 PKGBUILD            |   15 ++++++++-------
 haskell-aws.install |   18 ------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 13:54:53 UTC (rev 176889)
+++ PKGBUILD	2016-05-25 13:58:06 UTC (rev 176890)
@@ -5,12 +5,12 @@
 _hkgname=aws
 pkgname=haskell-aws
 pkgver=0.13.0
-pkgrel=43
+pkgrel=44
 pkgdesc="Amazon Web Services (AWS) for Haskell"
 url="http://github.com/aristidb/aws"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-aeson" "haskell-attoparsec" "haskell-base16-bytestring"
+depends=("ghc=8.0.1" "haskell-aeson" "haskell-attoparsec" "haskell-base16-bytestring"
          "haskell-base64-bytestring" "haskell-blaze-builder" "haskell-byteable"
          "haskell-case-insensitive" "haskell-cereal" "haskell-conduit"
          "haskell-conduit-extra" "haskell-cryptohash" "haskell-data-default"
@@ -19,14 +19,14 @@
          "haskell-resourcet" "haskell-safe" "haskell-scientific" "haskell-tagged"
          "haskell-text" "haskell-unordered-containers" "haskell-utf8-string"
          "haskell-vector" "haskell-xml-conduit")
-options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
 sha256sums=('3504c96a00d12fa0fe4ae5ab4dafa3eec7ca576a02ed7906cff70a75625a75a6')
 
 prepare() {
     sed -e 's/cereal               >= 0.3     && < 0.5,/cereal               >= 0.3     \&\& < 0.6,/' \
-        -e 's/data-default         >= 0.5.3   && < 0.6,/data-default         >= 0.5.3   \&\& < 0.7,/' \
+        -e 's/data-default         >= 0.5.3   && < 0.6,/data-default         >= 0.5.3   \&\& < 0.8,/' \
+        -e 's/transformers         >= 0.2.2   && < 0.5,/transformers         >= 0.2.2   \&\& < 0.6,/' \
+        -e 's/time                 >= 1.1.4   && < 1.6,/time                 >= 1.1.4   \&\& < 1.7,/' \
         -i ${_hkgname}-${pkgver}/${_hkgname}.cabal
 }
 
@@ -41,6 +41,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
 }
 
@@ -47,8 +48,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-aws.install
===================================================================
--- haskell-aws.install	2016-05-25 13:54:53 UTC (rev 176889)
+++ haskell-aws.install	2016-05-25 13:58:06 UTC (rev 176890)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-aws
-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)
-}