[arch-commits] Commit in haskell-yesod-core/trunk (2 files)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 06:46:19
  Author: fyan
Revision: 176528

upgpkg: haskell-yesod-core 1.4.20.2-8

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 04:45:16 UTC (rev 176527)
+++ PKGBUILD	2016-05-25 04:46:19 UTC (rev 176528)
@@ -5,12 +5,12 @@
 _hkgname=yesod-core
 pkgname=haskell-yesod-core
 pkgver=1.4.20.2
-pkgrel=7
+pkgrel=8
 pkgdesc="Creation of type-safe, RESTful web applications."
 url="http://www.yesodweb.com/"
 license=("MIT")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-aeson" "haskell-auto-update" "haskell-blaze-builder"
+depends=("ghc=8.0.1" "haskell-aeson" "haskell-auto-update" "haskell-blaze-builder"
          "haskell-blaze-html" "haskell-blaze-markup" "haskell-byteable"
          "haskell-case-insensitive" "haskell-cereal" "haskell-clientsession"
          "haskell-conduit" "haskell-conduit-extra" "haskell-cookie"
@@ -23,9 +23,7 @@
          "haskell-transformers-base" "haskell-unix-compat"
          "haskell-unordered-containers" "haskell-vector" "haskell-wai"
          "haskell-wai-extra" "haskell-wai-logger" "haskell-warp" "haskell-word8")
-options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
 sha256sums=('cfa62e47de410bff1fd37571a3c7fda92b0a5cd28e1df8d466c7a65b5a2e6f28')
 
 build() {
@@ -38,6 +36,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
 }
 
@@ -44,8 +43,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-yesod-core.install
===================================================================
--- haskell-yesod-core.install	2016-05-25 04:45:16 UTC (rev 176527)
+++ haskell-yesod-core.install	2016-05-25 04:46:19 UTC (rev 176528)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-yesod-core
-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)
-}