diff options
| author | Nicolás Reynolds <fauno@parabola.nu> | 2013-01-16 16:29:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-01-16 16:29:40 -0300 |
| commit | 0cebd4f8227080a80981c18e9d53430db2c175e0 (patch) | |
| tree | fe11576f6390118b5468d4a7713c584162335706 | |
| parent | 07e03724d81bc874ca4410b9fe536e903c05c3b6 (diff) | |
Fixed build for ghc 7.6
| -rw-r--r-- | pcr/pandoc/PKGBUILD | 5 | ||||
| -rw-r--r-- | pcr/pandoc/SRCBUILD | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 96f7015b9..3b3d97f86 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pandoc pkgver=1.9.4.5 -pkgrel=4 +pkgrel=5 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -75,3 +75,6 @@ md5sums=('5ccbf0a74bb8594e42f7c2448952680e' md5sums=('5ccbf0a74bb8594e42f7c2448952680e' '233ef5ec5bb7bc91c8cd9dbe09841558' 'e0f60926ed8bf5e8f592bb3aa649093b') +md5sums=('af01e55daded42fa54e8a2bb142c0a78' + '2e6916055ec2a2965596a08ea1e8d050' + '54b521d5c3ed5e2b53c4ca3206f6c941') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index 615a291f6..1eb01acc1 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -5,7 +5,9 @@ pkgname=pandoc pkgver=1.9.4.5 # 0.3.6 fails with embed_data_files _citeproc=0.3.5 -pkgrel=4 +# 0.4 doesn't work with ghc 7.6 +_blaze_html=0.5.1.3 +pkgrel=5 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -23,12 +25,12 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver} + cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --dry-run file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER + cabal install --dry-run file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER } package() { |