Date: Friday, May 20, 2016 @ 08:10:23 Author: fyan Revision: 175788 archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added: ghc-mod/repos/community-staging-i686/ ghc-mod/repos/community-staging-i686/PKGBUILD (from rev 175787, ghc-mod/trunk/PKGBUILD) ghc-mod/repos/community-staging-i686/cabal-helper-0.7.patch (from rev 175787, ghc-mod/trunk/cabal-helper-0.7.patch) ghc-mod/repos/community-staging-i686/haskell-ghc-mod.install (from rev 175787, ghc-mod/trunk/haskell-ghc-mod.install) ghc-mod/repos/community-staging-x86_64/ ghc-mod/repos/community-staging-x86_64/PKGBUILD (from rev 175787, ghc-mod/trunk/PKGBUILD) ghc-mod/repos/community-staging-x86_64/cabal-helper-0.7.patch (from rev 175787, ghc-mod/trunk/cabal-helper-0.7.patch) ghc-mod/repos/community-staging-x86_64/haskell-ghc-mod.install (from rev 175787, ghc-mod/trunk/haskell-ghc-mod.install) --------------------------------------------------+ community-staging-i686/PKGBUILD | 68 +++++++++++++++++++++ community-staging-i686/cabal-helper-0.7.patch | 38 +++++++++++ community-staging-i686/haskell-ghc-mod.install | 18 +++++ community-staging-x86_64/PKGBUILD | 68 +++++++++++++++++++++ community-staging-x86_64/cabal-helper-0.7.patch | 38 +++++++++++ community-staging-x86_64/haskell-ghc-mod.install | 18 +++++ 6 files changed, 248 insertions(+) Copied: ghc-mod/repos/community-staging-i686/PKGBUILD (from rev 175787, ghc-mod/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2016-05-20 06:10:23 UTC (rev 175788) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgbase=ghc-mod +pkgname=(ghc-mod haskell-ghc-mod) +pkgver=5.5.0.0 +pkgrel=27 +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" + "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') + +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + patch -p1 -i ../cabal-helper-0.7.patch +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + runhaskell Setup configure -O --enable-library-profiling --enable-shared \ + --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgbase" \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock --hoogle --html + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package_ghc-mod() { + depends=('cabal-helper' 'ghc') + + cd "${srcdir}/${pkgbase}-${pkgver}" + runhaskell Setup copy --destdir="${pkgdir}" + rm -r "$pkgdir"/usr/{lib,share/doc} + + install -D -m644 "COPYING.BSD3" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING.BSD3" +} + +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" + 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}" + rm -f "${pkgdir}/usr/share/doc/${pkgbase}/COPYING.BSD3" + rm -r "$pkgdir"/usr/{bin,share/$pkgbase} +} Copied: ghc-mod/repos/community-staging-i686/cabal-helper-0.7.patch (from rev 175787, ghc-mod/trunk/cabal-helper-0.7.patch) =================================================================== --- community-staging-i686/cabal-helper-0.7.patch (rev 0) +++ community-staging-i686/cabal-helper-0.7.patch 2016-05-20 06:10:23 UTC (rev 175788) @@ -0,0 +1,38 @@ +From b8076fc5d37854534c661f4e9d53af60bb3101f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <d...@darkboxed.org> +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 Copied: ghc-mod/repos/community-staging-i686/haskell-ghc-mod.install (from rev 175787, ghc-mod/trunk/haskell-ghc-mod.install) =================================================================== --- community-staging-i686/haskell-ghc-mod.install (rev 0) +++ community-staging-i686/haskell-ghc-mod.install 2016-05-20 06:10:23 UTC (rev 175788) @@ -0,0 +1,18 @@ +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) +} Copied: ghc-mod/repos/community-staging-x86_64/PKGBUILD (from rev 175787, ghc-mod/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2016-05-20 06:10:23 UTC (rev 175788) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgbase=ghc-mod +pkgname=(ghc-mod haskell-ghc-mod) +pkgver=5.5.0.0 +pkgrel=27 +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" + "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') + +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + patch -p1 -i ../cabal-helper-0.7.patch +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + runhaskell Setup configure -O --enable-library-profiling --enable-shared \ + --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgbase" \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock --hoogle --html + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package_ghc-mod() { + depends=('cabal-helper' 'ghc') + + cd "${srcdir}/${pkgbase}-${pkgver}" + runhaskell Setup copy --destdir="${pkgdir}" + rm -r "$pkgdir"/usr/{lib,share/doc} + + install -D -m644 "COPYING.BSD3" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING.BSD3" +} + +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" + 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}" + rm -f "${pkgdir}/usr/share/doc/${pkgbase}/COPYING.BSD3" + rm -r "$pkgdir"/usr/{bin,share/$pkgbase} +} Copied: ghc-mod/repos/community-staging-x86_64/cabal-helper-0.7.patch (from rev 175787, ghc-mod/trunk/cabal-helper-0.7.patch) =================================================================== --- community-staging-x86_64/cabal-helper-0.7.patch (rev 0) +++ community-staging-x86_64/cabal-helper-0.7.patch 2016-05-20 06:10:23 UTC (rev 175788) @@ -0,0 +1,38 @@ +From b8076fc5d37854534c661f4e9d53af60bb3101f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <d...@darkboxed.org> +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 Copied: ghc-mod/repos/community-staging-x86_64/haskell-ghc-mod.install (from rev 175787, ghc-mod/trunk/haskell-ghc-mod.install) =================================================================== --- community-staging-x86_64/haskell-ghc-mod.install (rev 0) +++ community-staging-x86_64/haskell-ghc-mod.install 2016-05-20 06:10:23 UTC (rev 175788) @@ -0,0 +1,18 @@ +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) +}