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

Felix Yan fyan at archlinux.org
Wed May 25 04:19:02 UTC 2016


    Date: Wednesday, May 25, 2016 @ 06:19:01
  Author: fyan
Revision: 176498

upgpkg: haskell-wai-extra 3.0.15.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-wai-extra/trunk/PKGBUILD
Deleted:
  haskell-wai-extra/trunk/haskell-wai-extra.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 04:18:20 UTC (rev 176497)
+++ PKGBUILD	2016-05-25 04:19:01 UTC (rev 176498)
@@ -5,12 +5,12 @@
 _hkgname=wai-extra
 pkgname=haskell-wai-extra
 pkgver=3.0.15.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Provides some basic WAI handlers and middleware."
 url="http://github.com/yesodweb/wai"
 license=("MIT")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-aeson" "haskell-ansi-terminal" "haskell-base64-bytestring"
+depends=("ghc=8.0.1" "haskell-aeson" "haskell-ansi-terminal" "haskell-base64-bytestring"
          "haskell-blaze-builder" "haskell-case-insensitive" "haskell-cookie"
          "haskell-data-default-class" "haskell-fast-logger" "haskell-http-types"
          "haskell-iproute" "haskell-lifted-base" "haskell-network" "haskell-old-locale"
@@ -17,9 +17,7 @@
          "haskell-resourcet" "haskell-streaming-commons" "haskell-stringsearch"
          "haskell-text" "haskell-unix-compat" "haskell-vault" "haskell-void" "haskell-wai"
          "haskell-wai-logger" "haskell-word8" "haskell-zlib")
-options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
 sha256sums=('6474f70915bfd9342ec126a3de76c6247e0788deb553fc46e1ba72c1f0f8e4ad')
 
 build() {
@@ -32,6 +30,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
 }
 
@@ -38,8 +37,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-wai-extra.install
===================================================================
--- haskell-wai-extra.install	2016-05-25 04:18:20 UTC (rev 176497)
+++ haskell-wai-extra.install	2016-05-25 04:19:01 UTC (rev 176498)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-wai-extra
-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