Date: Wednesday, June 8, 2016 @ 09:54:33 Author: fyan Revision: 178185
upgpkg: ghc-mod 5.5.0.0-28 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: ghc-mod/trunk/PKGBUILD Deleted: ghc-mod/trunk/cabal-helper-0.7.patch ghc-mod/trunk/haskell-ghc-mod.install -------------------------+ PKGBUILD | 30 +++++++++++------------------- cabal-helper-0.7.patch | 38 -------------------------------------- haskell-ghc-mod.install | 18 ------------------ 3 files changed, 11 insertions(+), 75 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-06-08 07:02:36 UTC (rev 178184) +++ PKGBUILD 2016-06-08 07:54:33 UTC (rev 178185) @@ -5,30 +5,22 @@ pkgbase=ghc-mod pkgname=(ghc-mod haskell-ghc-mod) pkgver=5.5.0.0 -pkgrel=27 +pkgrel=28 pkgdesc="Happy Haskell Programming" url="http://www.mew.org/~kazu/proj/ghc-mod/"; license=("AGPL3") arch=('i686' 'x86_64') -makedepends=("ghc=7.10.3" "haskell-cabal-helper" "haskell-djinn-ghc" "haskell-extra" +makedepends=("ghc=8.0.1" "git" "haskell-cabal-helper" "haskell-djinn-ghc" "haskell-extra" "haskell-fclabels" "haskell-ghc-paths" "haskell-ghc-syb-utils" "haskell-src-exts" "haskell-hlint" "haskell-monad-control" "haskell-monad-journal" "haskell-mtl" "haskell-old-time" "haskell-optparse-applicative" "haskell-pipes" "haskell-safe" "haskell-split" "haskell-syb" "haskell-temporary" "haskell-text" "haskell-transformers-base") -options=('staticlibs') -source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"; - cabal-helper-0.7.patch) -sha256sums=('d05be8f3541e875cd4ebefb28968cfc095fc323e49328f2e40581f6f5de70d31' - '9c7bc47104c560686c54c668c329e639fdb8dd744d67c0283654959f9c922d8b') +source=("git+https://github.com/DanielG/ghc-mod.git#commit=f2c7b01e372dd8c516b1ccbe5a1025cc7814347c";) +sha256sums=('SKIP') -prepare() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 -i ../cabal-helper-0.7.patch -} - build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgbase}" runhaskell Setup configure -O --enable-library-profiling --enable-shared \ --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgbase" \ @@ -37,6 +29,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 } @@ -43,7 +36,7 @@ package_ghc-mod() { depends=('cabal-helper' 'ghc') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgbase}" runhaskell Setup copy --destdir="${pkgdir}" rm -r "$pkgdir"/usr/{lib,share/doc} @@ -54,12 +47,11 @@ package_haskell-ghc-mod() { pkgdesc="Happy Haskell Programming (docs and libraries)" depends=("${makedepends[@]}" 'ghc-mod') - install="haskell-ghc-mod.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" + cd "${srcdir}/${pkgbase}" + + 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/${pkgbase}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgbase}" runhaskell Setup copy --destdir="${pkgdir}" Deleted: cabal-helper-0.7.patch =================================================================== --- cabal-helper-0.7.patch 2016-06-08 07:02:36 UTC (rev 178184) +++ cabal-helper-0.7.patch 2016-06-08 07:54:33 UTC (rev 178185) @@ -1,38 +0,0 @@ -From b8076fc5d37854534c661f4e9d53af60bb3101f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <[email protected]> -Date: Wed, 11 May 2016 15:13:19 +0200 -Subject: [PATCH] Bump cabal-helper dependency - -For Cabal-1.24 support ---- - Language/Haskell/GhcMod/Pretty.hs | 3 ++- - ghc-mod.cabal | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Language/Haskell/GhcMod/Pretty.hs b/Language/Haskell/GhcMod/Pretty.hs -index 1df6948..b2d9e7d 100644 ---- a/Language/Haskell/GhcMod/Pretty.hs -+++ b/Language/Haskell/GhcMod/Pretty.hs -@@ -32,7 +32,8 @@ gmRenderDoc = renderStyle docStyle - - gmComponentNameDoc :: ChComponentName -> Doc - gmComponentNameDoc ChSetupHsName = text $ "Setup.hs" --gmComponentNameDoc ChLibName = text $ "library" -+gmComponentNameDoc (ChLibName "") = text $ "library" -+gmComponentNameDoc (ChLibName n) = text $ "library:" ++ n - gmComponentNameDoc (ChExeName n) = text $ "exe:" ++ n - gmComponentNameDoc (ChTestName n) = text $ "test:" ++ n - gmComponentNameDoc (ChBenchName n) = text $ "bench:" ++ n -diff --git a/ghc-mod.cabal b/ghc-mod.cabal -index f583ca5..583e033 100644 ---- a/ghc-mod.cabal -+++ b/ghc-mod.cabal -@@ -165,7 +165,7 @@ Library - , bytestring < 0.11 - , binary < 0.9 && >= 0.5.1.0 - , containers < 0.6 -- , cabal-helper < 0.7 && >= 0.6.3.0 -+ , cabal-helper < 0.8 && >= 0.7.0.1 - , deepseq < 1.5 - , directory < 1.3 - , filepath < 1.5 Deleted: haskell-ghc-mod.install =================================================================== --- haskell-ghc-mod.install 2016-06-08 07:02:36 UTC (rev 178184) +++ haskell-ghc-mod.install 2016-06-08 07:54:33 UTC (rev 178185) @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-ghc-mod -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) -}
