diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-10-23 17:46:51 -0200 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-10-23 17:46:51 -0200 |
commit | 653124cdda8e741e9808c0519be38fa297b1ffbe (patch) | |
tree | 097e49a57d54e62db7e15ce6cddc50d8831cc607 /pcr/pandoc/SRCBUILD | |
parent | f105063feb44f95112c3a341eded6e782260ea80 (diff) | |
parent | eaac0d9a7627f835a4e94914d56f40d2a2fd5ce4 (diff) | |
download | abslibre-653124cdda8e741e9808c0519be38fa297b1ffbe.tar.gz abslibre-653124cdda8e741e9808c0519be38fa297b1ffbe.tar.bz2 abslibre-653124cdda8e741e9808c0519be38fa297b1ffbe.zip |
Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre
Diffstat (limited to 'pcr/pandoc/SRCBUILD')
-rw-r--r-- | pcr/pandoc/SRCBUILD | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index 9cc4b128e..c907517cc 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,8 +2,8 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.12.4.2 -pkgrel=2 +pkgver=1.13.1 +pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -11,24 +11,33 @@ arch=('any') makedepends=('ghc' 'sh' 'cabal-install') source=() options=(!strip) +_flags=(https embed_data_files bibutils hexpat unicode_collation) +_packages=(hs-bibutils network hexpat text text-icu hsb2hs + http-client-0.3.8.2 + http-client-tls http-types ${pkgname}-${pkgver} + pandoc-citeproc) + +_cabal() { + HOME=${srcdir}/${pkgname}-${pkgver} cabal $@ +} # PKGBUILD functions build() { - mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} - cd ${srcdir}/${pkgname}-${pkgver} - - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 update + mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} + cd ${srcdir}/${pkgname}-${pkgver} - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch hs-bibutils network hexpat text text-icu hsb2hs ${pkgname}-${pkgver} pandoc-citeproc + _cabal --verbose=3 update + _cabal --verbose=3 fetch ${_packages[@]} - msg2 "Getting the dependency build order" + msg2 "Getting the dependency build order" # Ignore the cabal messages - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run text hsb2hs ${pkgname}-${pkgver} pandoc-citeproc | - grep "\-[0-9]\+" | - tee BUILDORDER + _cabal install \ + --flags="${flags[@]}"\ + --dry-run \ + ${_packages[@]} | + grep "\-[0-9]\+" | + cut -d" " -f1 | + tee BUILDORDER } package() { |