From 146424b354c6754f5ba6772e1819aa7b7b80fc45 Mon Sep 17 00:00:00 2001 From: radiden Date: Tue, 6 Apr 2021 00:24:56 +0200 Subject: [PATCH] pandoc: update to 2.11.4. --- srcpkgs/pandoc/files/stack.yaml | 26 +++++++++----------------- srcpkgs/pandoc/template | 18 ++++++------------ 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml index 47bf3bb1b5e4..82a5fcaded3f 100644 --- a/srcpkgs/pandoc/files/stack.yaml +++ b/srcpkgs/pandoc/files/stack.yaml @@ -1,31 +1,23 @@ -resolver: lts-16.20 +resolver: lts-17.9 packages: - - ./pandoc-2.10.1 - - ./pandoc-citeproc-0.17.0.1 + - ./pandoc-2.11.4 - ./pandoc-sidenote-0.20.0 flags: pandoc: trypandoc: false embed_data_files: true - static: false - pandoc-citeproc: - bibutils: true - embed_data_files: true - unicode_collation: false - test_citeproc: false - debug: false extra-deps: - - pandoc-types-1.21 + - pandoc-types-1.22 - haddock-library-1.9.0 - - regex-pcre-builtin-0.95.1.2.8.43 - - hslua-1.1.2 - - jira-wiki-markup-1.3.2 - - commonmark-0.1.0.1 - - commonmark-extensions-0.2.0.0 - - commonmark-pandoc-0.2.0.0 + - regex-pcre-builtin-0.95.2.3.8.43 + - hslua-1.2.0 + - jira-wiki-markup-1.3.4 + - commonmark-0.1.1.4 + - commonmark-extensions-0.2.0.4 + - commonmark-pandoc-0.2.0.1 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template index 7d7fbdc4b72b..ad233dd0aaf3 100644 --- a/srcpkgs/pandoc/template +++ b/srcpkgs/pandoc/template @@ -1,34 +1,30 @@ # Template file for 'pandoc' pkgname=pandoc # Keep in sync with http://www.stackage.org/lts -version=2.10.1 -revision=3 -_citeproc_version=0.17.0.1 +version=2.11.4 +revision=1 _sidenote_version=0.20.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 - --flag=hslua:system-lua --flag=hslua:pkg-config" + --flag pandoc:embed_data_files --flag=hslua:system-lua + --flag=hslua:pkg-config" hostmakedepends="pkg-config unzip wget" makedepends="zlib-devel lua53-devel tar" -short_desc="Universal converter between markup formats (with citeproc support)" +short_desc="Universal converter between markup formats" maintainer="Leah Neukirchen " license="GPL-2.0-or-later, BSD-3-Clause, MIT" 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 https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \ https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz" -checksum="938a4c9b0a7ed3de886c73af4052913b0ac9e4aa12b435bd2afd09670bd3229a - f3e5ce3d1d21c27178f2fc69580750e3ce97fc5f962f2d01f7b6aa2e090c2342 +checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5 34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465" nocross=yes nopie_files=" /usr/bin/pandoc - /usr/bin/pandoc-citeproc /usr/bin/pandoc-sidenote " @@ -38,8 +34,6 @@ post_extract() { } post_install() { 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 vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote }