From: Ricardo Wurmus <rekado@elephly.net>
To: 52333@debbugs.gnu.org
Cc: Ricardo Wurmus <rekado@elephly.net>
Subject: bug#52333: [PATCH 1/2] gnu: python-nbconvert: Embed reference to texlive-bin, not texlive-union.
Date: Mon, 6 Dec 2021 18:30:53 +0100 [thread overview]
Message-ID: <20211206173054.29439-1-rekado@elephly.net> (raw)
In-Reply-To: <87h7blwty2.fsf@elephly.net>
* gnu/packages/python-xyz.scm (python-nbconvert)[inputs]: Add texlive-bin.
[arguments]: Embed reference to xelatex and bibtex from the texlive-bin, not
the texlive-union.
---
gnu/packages/python-xyz.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 81b99e1d2e..602833c4f4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12117,14 +12117,15 @@ (define-public python-nbconvert
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths-and-tests
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
;; Use pandoc binary from input.
(substitute* "nbconvert/utils/pandoc.py"
(("'pandoc'") (string-append "'" (which "pandoc") "'")))
;; Same for LaTeX.
- (substitute* "nbconvert/exporters/pdf.py"
- (("\"xelatex\"") (string-append "\"" (which "xelatex") "\""))
- (("\"bibtex\"") (string-append "\"" (which "bibtex") "\"")))
+ (let ((texlive (assoc-ref inputs "texlive-bin")))
+ (substitute* "nbconvert/exporters/pdf.py"
+ (("\"xelatex\"") (string-append "\"" texlive "/bin/xelatex\""))
+ (("\"bibtex\"") (string-append "\"" texlive "/bin/bibtex\""))))
;; Make sure tests are not skipped.
(substitute* (find-files "." "test_.+\\.py$")
(("@onlyif_cmds_exist\\(('(pandoc|xelatex)'(, )?)+\\)") ""))
@@ -12158,6 +12159,7 @@ (define-public python-nbconvert
(invoke "pytest" "-vv")))))))
(inputs
`(("pandoc" ,pandoc)
+ ("texlive-bin" ,texlive-bin)
;; XXX: Disabled, needs substitute*.
;;("inkscape" ,inkscape)
))
--
2.34.0
next prev parent reply other threads:[~2021-12-06 17:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 16:56 bug#52333: [PATCH] Remove extraneous references Ricardo Wurmus
2021-12-06 17:30 ` Ricardo Wurmus [this message]
2021-12-06 17:30 ` bug#52333: [PATCH 2/2] gnu: r-minimal: " Ricardo Wurmus
2021-12-06 23:03 ` bug#52333: [PATCH 1/2] gnu: python-nbconvert: Embed reference to texlive-bin, not texlive-union Ricardo Wurmus
2021-12-15 12:53 ` bug#52333: [PATCH] Remove extraneous references Ricardo Wurmus
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211206173054.29439-1-rekado@elephly.net \
--to=rekado@elephly.net \
--cc=52333@debbugs.gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).