diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-07 17:31:10 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-07 17:31:10 +0100 |
commit | 0e48701e4ef754a7d5aab1e8fa1ef6ba8ff3c441 (patch) | |
tree | a01dc4371165970aa77e40aaaf74ba1eae8daf47 /pcr/pandoc/SRCBUILD | |
parent | 1ac5165814a8df7108dae57ebb527efd21873461 (diff) | |
parent | d8d675cb1e75787b0db061756e4cbebe3c5a03fa (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/busybox/PKGBUILD
community/glpng/PKGBUILD
community/hercules/PKGBUILD
community/libnetfilter_acct/PKGBUILD
community/libvirt/PKGBUILD
extra/crypto++/PKGBUILD
extra/hexedit/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/ntfs-3g_ntfsprogs/PKGBUILD
extra/opencv/PKGBUILD
extra/qemu-kvm/PKGBUILD
extra/xf86-input-wacom/PKGBUILD
extra/xfce4-eyes-plugin/PKGBUILD
extra/xfdesktop/PKGBUILD
Diffstat (limited to 'pcr/pandoc/SRCBUILD')
-rw-r--r-- | pcr/pandoc/SRCBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index c1cfbfa5c..4c7f5de8d 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,7 +2,7 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.10.0.4 +pkgver=1.10.1 # 0.4 doesn't work with ghc 7.6 # Use blaze_html_0_5 flag in the future _blaze_html=0.5.1.3 @@ -29,7 +29,7 @@ build() { msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER + cabal install --flags="blaze_html_0_5" --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER } package() { |