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

Felix Yan fyan at archlinux.org
Thu May 26 03:27:36 UTC 2016


    Date: Thursday, May 26, 2016 @ 05:27:35
  Author: fyan
Revision: 177091

upgpkg: stack 1.1.2-1

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

-----------------------+
 PKGBUILD              |   53 ++++++++++++++++++++++++++----------------------
 haskell-stack.install |   18 ----------------
 2 files changed, 29 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-26 03:26:30 UTC (rev 177090)
+++ PKGBUILD	2016-05-26 03:27:35 UTC (rev 177091)
@@ -4,38 +4,43 @@
 
 pkgbase=stack
 pkgname=(stack haskell-stack)
-pkgver=1.1.0
-pkgrel=6
+pkgver=1.1.2
+pkgrel=1
 pkgdesc="The Haskell Tool Stack"
 url="https://github.com/commercialhaskell/stack"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-makedepends=("ghc=7.10.3" "haskell-aeson" "haskell-ansi-terminal" "haskell-async"
-             "haskell-attoparsec" "haskell-base16-bytestring" "haskell-base64-bytestring"
-             "haskell-binary-tagged" "haskell-blaze-builder" "haskell-byteable"
-             "haskell-conduit" "haskell-conduit-extra" "haskell-cryptohash"
+makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-ansi-terminal" "haskell-async"
+             "haskell-attoparsec" "haskell-base-compat" "haskell-base16-bytestring"
+             "haskell-base64-bytestring" "haskell-binary-tagged" "haskell-blaze-builder"
+             "haskell-byteable" "haskell-conduit" "haskell-conduit-extra" "haskell-cryptohash"
              "haskell-cryptohash-conduit" "haskell-edit-distance" "haskell-either"
-             "haskell-enclosed-exceptions" "haskell-errors" "haskell-exceptions"
-             "haskell-extra" "haskell-fast-logger" "haskell-filelock" "haskell-fsnotify"
-             "haskell-gitrev" "haskell-hashable" "haskell-hastache" "haskell-http-client"
-             "haskell-http-client-tls" "haskell-http-conduit" "haskell-http-types"
-             "haskell-hpack" "haskell-lifted-base" "haskell-microlens"
-             "haskell-monad-control" "haskell-monad-logger" "haskell-mtl"
+             "haskell-enclosed-exceptions" "haskell-errors" "haskell-exceptions" "haskell-extra"
+             "haskell-fast-logger" "haskell-filelock" "haskell-fsnotify" "haskell-generic-deriving"
+             "haskell-gitrev" "haskell-hashable" "haskell-hastache" "haskell-hit"
+             "haskell-http-client" "haskell-http-client-tls" "haskell-http-conduit"
+             "haskell-http-types" "haskell-hpack" "haskell-lifted-base" "haskell-microlens"
+             "haskell-monad-control" "haskell-monad-logger" "haskell-monad-unlift" "haskell-mtl"
              "haskell-open-browser" "haskell-optparse-applicative" "haskell-optparse-simple"
              "haskell-path" "haskell-path-io" "haskell-persistent" "haskell-persistent-sqlite"
-             "haskell-persistent-template" "haskell-project-template" "haskell-resourcet"
-             "haskell-retry" "haskell-safe" "haskell-semigroups" "haskell-split" "haskell-stm"
-             "haskell-streaming-commons" "haskell-tar" "haskell-temporary" "haskell-text"
-             "haskell-text-binary" "haskell-transformers-base" "haskell-unix-compat"
-             "haskell-unordered-containers" "haskell-vector" "haskell-vector-binary-instances"
-             "haskell-yaml" "haskell-zip-archive" "haskell-zlib")
-options=('staticlibs')
+             "haskell-persistent-template" "haskell-project-template"
+             "haskell-regex-applicative-text" "haskell-resourcet" "haskell-retry" "haskell-safe"
+             "haskell-semigroups" "haskell-split" "haskell-stm" "haskell-streaming-commons"
+             "haskell-tar" "haskell-temporary" "haskell-text" "haskell-text-binary" "haskell-tls"
+             "haskell-transformers-base" "haskell-unix-compat" "haskell-unordered-containers"
+             "haskell-vector" "haskell-vector-binary-instances" "haskell-yaml"
+             "haskell-zip-archive" "haskell-zlib")
 source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz")
-sha256sums=('58cce7048438bc452a81384493b4644034d5a0b456acd51bf7c19098a9cf406a')
+sha256sums=('fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625')
 
 prepare() {
     sed -e 's/zip-archive >=0.2.3.7 && <0.3,/zip-archive >=0.2.3.7 \&\& <0.4,/' \
-        -e 's/hpack >=0.10.0 && <0.14/hpack >=0.10.0 \&\& <0.15/' \
+        -e 's/binary ==0.7.*,/binary >= 0.7.* \&\& < 0.9,/' \
+        -e 's/generic-deriving >=1.9.0 && <1.10,/generic-deriving >=1.9.0 \&\& <1.11,/' \
+        -e 's/process >=1.2.0.0 && <1.3,/process >=1.2.0.0 \&\& <1.5,/' \
+        -e 's/template-haskell >=2.9.0.0 && <2.11,/template-haskell >=2.9.0.0 \&\& <2.12,/' \
+        -e 's/time >=1.4.2 && <1.6,/time >=1.4.2 \&\& <1.7,/' \
+        -e 's/transformers >=0.3.0.0 && <0.5,/transformers >=0.3.0.0 \&\& <0.6,/' \
         -i ${pkgbase}-${pkgver}/${pkgbase}.cabal
 }
 
@@ -50,6 +55,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
 }
 
@@ -70,12 +76,11 @@
 package_haskell-stack() {
     pkgdesc="The Haskell Tool Stack (docs and libraries)"
     depends=("${makedepends[@]}" 'stack')
-    install="haskell-stack.install"
 
     cd "${srcdir}/${pkgbase}-${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/${pkgbase}"
     runhaskell Setup copy --destdir="${pkgdir}"

Deleted: haskell-stack.install
===================================================================
--- haskell-stack.install	2016-05-26 03:26:30 UTC (rev 177090)
+++ haskell-stack.install	2016-05-26 03:27:35 UTC (rev 177091)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-stack
-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