From d6576ca89857249389594b270d576b554168a68f Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sat, 15 Aug 2015 21:03:55 +0200 Subject: [PATCH] pandoc: update to 1.15.0.6. Move to stack. --- srcpkgs/pandoc/template | 49 ++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template index f9731e5cf25..33e37fde123 100644 --- a/srcpkgs/pandoc/template +++ b/srcpkgs/pandoc/template @@ -1,42 +1,35 @@ # Template file for 'pandoc' pkgname=pandoc -version=1.14.0.4 -_citeproc_version=0.7.1.1 -revision=2 +# Keep in sync with http://www.stackage.org/lts +version=1.15.0.6 +_citeproc_version=0.7.3 +_stackage="lts-3.0" +revision=1 nocross=yes -hostmakedepends="cabal-install" +create_wrksrc=yes +hostmakedepends="ghc stack hsb2hs" makedepends="zlib-devel" short_desc="Universal converter between markup formats (with citeproc support)" maintainer="Christian Neukirchen " license="GPL-2" homepage="http://johnmacfarlane.net/pandoc/" -distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=01955bfb1f397ec22bbce10e2df7b4f2214b7289bf79bf51eb7ae0e3b427fadf +distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz + http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz" +checksum="d950968142526d5a765af7dfb26b47c3f60d4f883aa9d9eab668614179f1ed46 + 72fc81d962812d037bb78c6d38d602ca2c6895f0436c8be94cb71600ed288e68" do_build() { - cabal sandbox init - export PATH="$PWD/.cabal-sandbox/bin:$PATH" - cabal update - cabal install ${makejobs} --user hsb2hs - cabal install ${makejobs} --user --only-dependencies - cabal configure -v --prefix=/usr --libsubdir='$pkg' \ - --datasubdir='$pkg' --docdir='$datadir/doc/$pkg' \ - --flags="embed_data_files" - cabal build ${makejobs} - cabal install ${makejobs} --user pandoc-citeproc-${_citeproc_version} \ - --flags="embed_data_files" + export STACK_ROOT=$wrksrc/.stack + stack init --force --resolver ${_stackage} + stack ${makejobs} build --flag pandoc:-old-locale --flag pandoc:embed_data_files } do_install() { - cabal copy --destdir="$DESTDIR/" - vlicense "$DESTDIR/usr/share/pandoc/COPYRIGHT" LICENSE.pandoc - for f in .cabal-sandbox/share/doc/*/pandoc-citeproc-*/LICENSE; do - vlicense $f LICENSE.pandoc-citeproc - done - rm -r "$DESTDIR/usr/lib" "$DESTDIR/usr/share/doc/pandoc/COPYING" \ - "$DESTDIR/usr/share/pandoc/COPYRIGHT" - vbin .cabal-sandbox/bin/pandoc-citeproc - vman .cabal-sandbox/share/man/man1/pandoc-citeproc.1 - vman man/man1/pandoc.1 - vman man/man5/pandoc_markdown.5 + export STACK_ROOT=$wrksrc/.stack + vmkdir usr/bin + stack install --flag pandoc:-old-locale --flag pandoc:embed_data_files --local-bin-path=${DESTDIR}/usr/bin + vman pandoc-${version}/man/pandoc.1 + vman pandoc-citeproc-${_citeproc_version}/man/man1/pandoc-citeproc.1 + vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc + vlicense pandoc-citeproc-${_citeproc_version}/LICENSE LICENSE.pandoc-citeproc }