From: slotThe <slotThe@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] pandoc: unbreak i686 build
Date: Wed, 21 Oct 2020 19:01:21 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25772@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There is a new pull request by slotThe against master on the void-packages repository
https://github.com/slotThe/void-packages fix-pandoc-i686
https://github.com/void-linux/void-packages/pull/25772
pandoc: unbreak i686 build
As per composewell/unicode-transforms/issues/52 we simply need to update the version of `unicode-transforms` that pandoc depends on.
A patch file from https://github.com/void-linux/void-packages/pull/25772.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-pandoc-i686-25772.patch --]
[-- Type: text/x-diff, Size: 1472 bytes --]
From a7b3a7432501ae6cd20341b9f8eac2dc118e34e2 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 21 Oct 2020 17:55:26 +0200
Subject: [PATCH] pandoc: unbreak i686 build
---
srcpkgs/pandoc/files/stack.yaml | 1 +
srcpkgs/pandoc/template | 6 +-----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
index e94732d9e6d..00eca66a7a6 100644
--- a/srcpkgs/pandoc/files/stack.yaml
+++ b/srcpkgs/pandoc/files/stack.yaml
@@ -34,6 +34,7 @@ extra-deps:
- commonmark-0.1.0.1
- commonmark-extensions-0.2.0.0
- commonmark-pandoc-0.2.0.0
+ - unicode-transforms-0.3.7.1
ghc-options:
"$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 86d876a7588..b733645fe01 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,7 +2,7 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.10.1
-revision=1
+revision=2
_citeproc_version=0.17.0.1
_sidenote_version=0.20.0
_monad_gen_version=0.3.0.1
@@ -32,10 +32,6 @@ nopie_files="
/usr/bin/pandoc-sidenote
"
-case "$XBPS_TARGET_MACHINE" in
- i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/28037/steps/shell_3/logs/stdio" ;;
-esac
-
post_extract() {
sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal
sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal
next reply other threads:[~2020-10-21 17:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 17:01 slotThe [this message]
2020-10-21 17:15 ` [PR PATCH] [Merged]: " q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25772@inbox.vuxu.org \
--to=slotthe@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).