From 6690af0669cc8cce2371fe569bfc1785e92ab63a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 25 Oct 2019 12:38:20 +0200 Subject: [PATCH] pandoc: use system lua, add pandoc-sidenote. Closes #15370. --- srcpkgs/pandoc/template | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template index af56c10b9a9..8013188149f 100644 --- a/srcpkgs/pandoc/template +++ b/srcpkgs/pandoc/template @@ -2,27 +2,35 @@ pkgname=pandoc # Keep in sync with http://www.stackage.org/lts version=2.7.3 -revision=1 +revision=2 _citeproc_version=0.16.2 +_sidenote_version=0.19.0.0 +_monad_gen_version=0.3.0.1 create_wrksrc=yes build_style=haskell-stack make_build_args=" - --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files" -stackage="lts-14.0" -hostmakedepends="unzip wget" -makedepends="zlib-devel" + --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files + --flag=hslua:system-lua --flag=hslua:pkg-config" +stackage="lts-14.11" +hostmakedepends="pkg-config unzip wget" +makedepends="zlib-devel lua-devel" short_desc="Universal converter between markup formats (with citeproc support)" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://johnmacfarlane.net/pandoc/" 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" + http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz + http://hackage.haskell.org/package/${pkgname}-sidenote-${_sidenote_version}/${pkgname}-sidenote-${_sidenote_version}.tar.gz + https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz" checksum="a877203379ec5179716d6999f76352229d7f40f5bec70dbfa48c140848cef236 - 5b6725b003474f19fd7de65f3371a015a7b210b42543fe952f2bc4c7d509b596" + 5b6725b003474f19fd7de65f3371a015a7b210b42543fe952f2bc4c7d509b596 + 63adff9f8069e36d6e347d9c3172b3b1c9d903a94195eff88d10d4ff5ae0e86f + be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465" nocross=yes nopie_files=" /usr/bin/pandoc /usr/bin/pandoc-citeproc + /usr/bin/pandoc-sidenote " post_extract() { @@ -34,4 +42,5 @@ post_install() { 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 + vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote }