Date: Friday, May 13, 2016 @ 09:28:17 Author: fyan Revision: 175127 upgpkg: ghc-mod 5.5.0.0-26
rebuild with cabal-helper-0.7.0.1, cryptohash-sha256-0.11.7.2, either-4.4.1.1, extra-1.4.6, math-functions-0.1.7.0, git-annex-6.20160511, streaming-commons-0.1.15.5, tls-1.3.8, xml-conduit-1.3.5 Added: ghc-mod/trunk/cabal-helper-0.7.patch Modified: ghc-mod/trunk/PKGBUILD ------------------------+ PKGBUILD | 13 ++++++++++--- cabal-helper-0.7.patch | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-13 07:22:24 UTC (rev 175126) +++ PKGBUILD 2016-05-13 07:28:17 UTC (rev 175127) @@ -5,7 +5,7 @@ pkgbase=ghc-mod pkgname=(ghc-mod haskell-ghc-mod) pkgver=5.5.0.0 -pkgrel=25 +pkgrel=26 pkgdesc="Happy Haskell Programming" url="http://www.mew.org/~kazu/proj/ghc-mod/"; license=("AGPL3") @@ -17,9 +17,16 @@ "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";) -sha256sums=('d05be8f3541e875cd4ebefb28968cfc095fc323e49328f2e40581f6f5de70d31') +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}" Added: cabal-helper-0.7.patch =================================================================== --- cabal-helper-0.7.patch (rev 0) +++ cabal-helper-0.7.patch 2016-05-13 07:28:17 UTC (rev 175127) @@ -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
