From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gAEXKytJrmHXcwEAgWs5BA (envelope-from ) for ; Mon, 06 Dec 2021 18:32:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0NavJitJrmEMeAAAbx9fmQ (envelope-from ) for ; Mon, 06 Dec 2021 17:32:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7B39884F2 for ; Mon, 6 Dec 2021 18:32:27 +0100 (CET) Received: from localhost ([::1]:49688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muHqk-0005Ld-Kz for larch@yhetil.org; Mon, 06 Dec 2021 12:32:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muHqM-0005Jd-EM for bug-guix@gnu.org; Mon, 06 Dec 2021 12:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muHqM-00046G-5c for bug-guix@gnu.org; Mon, 06 Dec 2021 12:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1muHqM-0001CM-1s for bug-guix@gnu.org; Mon, 06 Dec 2021 12:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#52333: [PATCH 1/2] gnu: python-nbconvert: Embed reference to texlive-bin, not texlive-union. References: <87h7blwty2.fsf@elephly.net> In-Reply-To: <87h7blwty2.fsf@elephly.net> Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 06 Dec 2021 17:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52333 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 52333@debbugs.gnu.org Received: via spool by 52333-submit@debbugs.gnu.org id=B52333.16388118764523 (code B ref 52333); Mon, 06 Dec 2021 17:32:01 +0000 Received: (at 52333) by debbugs.gnu.org; 6 Dec 2021 17:31:16 +0000 Received: from localhost ([127.0.0.1]:35310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muHpc-0001As-DL for submit@debbugs.gnu.org; Mon, 06 Dec 2021 12:31:16 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muHpb-0001Al-G7 for 52333@debbugs.gnu.org; Mon, 06 Dec 2021 12:31:16 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1638811872; cv=none; d=zohomail.com; s=zohoarc; b=RVjFbZBrRo6qFnHwI3IpDkAolA8onccu4Vyp658wB6Jxu4fr2gJplxpMRWr6B/PNOUo4dTIyawnsTA9+RL8AMusaD7TJGzz3xnBJs/m4PRMA8fXeXyINBRUSnZQCfZCzEjybngCpKPlIcB7/GnsPu4hFUwXTYU4Tuw1aQJE0cPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638811872; h=Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=UAQNLM2OKrtA2McLWHEJGRqr6PW0DUXnSqqyBX064lw=; b=kTFvrsr9jZNLdqZHuR8JD9pbC8Jg+AQcHlINCMsZWLTZ8zi5+qy98sTGhAZFS89UNRYYBVL/dqq8DY7PaFDkR/y39AFTVHRfn3QrV21CFAQGv9i/K7lhMTJVlfClChTAiiOVUSChLgcCLJzzm8everASpJAuJs6xBtSsL+p+XM0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1638811872; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Transfer-Encoding; bh=UAQNLM2OKrtA2McLWHEJGRqr6PW0DUXnSqqyBX064lw=; b=D/Jq/lRDq1zQU5r2+2BxzF2N2I2wjOeBhxFS8LbQmKYa4rBNBHCQ3xArUef8vDYj 74vls57xBVribDmRe2+jE2rpHsSNywZt3oDBHuvT7MYaYnW3KNRjxHeF9SMnQ3PaZ8V nU54TGmJjjGFV8yPcJ97fgmnwdtRTzo2s7S1KmOI= Received: from localhost (p54ad4e5b.dip0.t-ipconnect.de [84.173.78.91]) by mx.zohomail.com with SMTPS id 1638811859331349.65148030132036; Mon, 6 Dec 2021 09:30:59 -0800 (PST) From: Ricardo Wurmus Date: Mon, 6 Dec 2021 18:30:53 +0100 Message-Id: <20211206173054.29439-1-rekado@elephly.net> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ricardo Wurmus Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638811947; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=UAQNLM2OKrtA2McLWHEJGRqr6PW0DUXnSqqyBX064lw=; b=F660fBsbnhBXzkqE6zJEUIXeU5H3CSnnBqUHB6YktP/t0gmObZy13ZDMJew/ea53sAyCjc sfgN4D58MSzPDDMPr5f8qXQKMnVTnYC4l0W7CfdY8NQuNrE/A0LmuPafJ/eJDkeW5t+IBI HpEM+xzfpjri27lmKwExExUDSSr5CF/Mye+aEgssYfFilL07DaQr8I5Iw90zZJltRQLRvx KEEJ4rOpJ7zpl/LjKu7MJfXRLlEjp9hQePBam6IU/EeLRjf5uj0JfV2dT0A3n/jEoE3Lad fXKTJ6KcD88lUuNJQz3H9pMM8MStCdfSyp+H4HgBElztvq3KkiTloRVTl6FBKQ== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1638811947; a=rsa-sha256; cv=fail; b=r83ESvnx2zMe1YpAdygSyp/2K7naGZYb9S7OtWSbZZfUZpEgAameD3VYMao7eBTGy0jriQ Ob1tAcNZibMJ3N50lQRUpomxzM6yrsl03VbPUCDIBQ3v0BJ9NOWIaCcw2HvItImGx2Qp6l 2Cytv2JO97hW8N1GwfLbPLJFHc+Thgv1y+rjC+FDtYRfuSxqvKxkTiRto1zDOpxm04laD3 xH5ttCTkc9TbUw98O/0DLRaWA/vsUQT4mAS6uRayHaLt9YbkV8zuORTni4BmocGOiv2CL4 21DqWXGRrWhH/vygx5WvevXcU6dQb+OqTUptGeYIg5DQ2F0ehWBKeFzbfv/Dfw== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b="D/Jq/lRD"; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 0.56 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b="D/Jq/lRD"; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 7B39884F2 X-Spam-Score: 0.56 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2sPvfZ7l7/dQ * 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