From patchwork Sun May 15 04:37:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 39315 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C434D27BBEA; Sun, 15 May 2022 05:58:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8EBA227BBE9 for ; Sun, 15 May 2022 05:58:35 +0100 (BST) Received: from localhost ([::1]:57524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq6Kw-0001pv-PH for patchwork@mira.cbaines.net; Sun, 15 May 2022 00:58:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq6HW-0007Rb-GI for guix-patches@gnu.org; Sun, 15 May 2022 00:55:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq6HW-00063C-5b for guix-patches@gnu.org; Sun, 15 May 2022 00:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq6HW-0003PU-5I for guix-patches@gnu.org; Sun, 15 May 2022 00:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55424] [PATCH 087/602] gnu: dot2tex: Update to 2.11.3. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 04:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55424 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55424@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55424-submit@debbugs.gnu.org id=B55424.165259048112982 (code B ref 55424); Sun, 15 May 2022 04:55:02 +0000 Received: (at 55424) by debbugs.gnu.org; 15 May 2022 04:54:41 +0000 Received: from localhost ([127.0.0.1]:48108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6Gx-0003MZ-7H for submit@debbugs.gnu.org; Sun, 15 May 2022 00:54:40 -0400 Received: from mail-vk1-f175.google.com ([209.85.221.175]:35687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6Gv-0003ME-Ma for 55424@debbugs.gnu.org; Sun, 15 May 2022 00:54:25 -0400 Received: by mail-vk1-f175.google.com with SMTP id e7so6055076vkh.2 for <55424@debbugs.gnu.org>; Sat, 14 May 2022 21:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CewHl8VBgDvXvQ594AU2AecuOmZj80Ps5940gwt+w+I=; b=bB0sl5ID2EbWYSEgu1De8+EIOt5tmc0/J5aNWIck2qVwnclYEfsgRm4MDhQvW92T7P O7ikzcPhPlQHss37CGH65BFOXY7p0hDbD5yUrO29hvebHQ89I/72xQn74ZMOn5Ycd6gu SW2rm7JNAWjU5tEie3AZidvwnY/iugKilenOvXeRFi3i4kE3wqJN4cmP7bCFfM9vesvm qpKUXxTLyk3MGoM/JE6fo7sVh3tvK28mvkssvKD3cwO5TZOSN2DFklH29SD1zJmcMHb1 wxlrmZk41icQJAFOEk1zHHKNOIUdj02clURHPCCAJvXhFSTHyJPlZhOkBPUpShC1fYtw bpkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CewHl8VBgDvXvQ594AU2AecuOmZj80Ps5940gwt+w+I=; b=afuDF1djAXuAjReDRbjF58ib23ZZG4osH7ed7bjdVlHLJN716ttwNbCqUKl/xDiM0u KPX3NBL//RyV6lgR4ABAxym2glNBnpu4ij4hrK1l6LRDyRg9aMdoYQmkTgZbSEEWwIrh ueob5Fq+vQ5VJ6BxvH/J6Bj58esjRYxH0igA2yXgLnSQzqaanT/PY72oJMaDKp9YZ1yA qv58s05yp2FT1X0TPyWAeY1/IzvM5APukQGtQBKm5JIQKxfFIKREWgBCRD0AAMpqQ8hv UMadLmS/GEvkmsVq8Ab4ZfG4KyQHyxBbmvKSosaQpXEPpNxMgRy5uBxDYSPTnC/0nDl1 CpEQ== X-Gm-Message-State: AOAM533q3muuskt53QDcb5URm0JhNiTxZ1nWxYPWK9fbH6dn209s5DIi NMNFZEWD6xpSohkOzFSDxJtw/MTNd5Ac/A== X-Google-Smtp-Source: ABdhPJxe9yHRLbu9D1IuHiHJscb1Bq6EK5Q9zwoPdpkcoPhp8yPbt+9BLt33dmQPdrnYGEKz9o1Z1Q== X-Received: by 2002:ad4:5aed:0:b0:461:caa6:81f8 with SMTP id c13-20020ad45aed000000b00461caa681f8mr451748qvh.49.1652590074966; Sat, 14 May 2022 21:47:54 -0700 (PDT) Received: from localhost.localdomain (dsl-149-239.b2b2c.ca. [66.158.149.239]) by smtp.gmail.com with ESMTPSA id 2-20020ac82082000000b002f39b99f672sm4287690qtd.12.2022.05.14.21.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 21:47:54 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 15 May 2022 00:37:54 -0400 Message-Id: <20220515044629.6843-87-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515044629.6843-1-maxim.cournoyer@gmail.com> References: <20220515044629.6843-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graphviz.scm (dot2tex): Update to 2.11.3. [arguments]: Remove python argument. [phases]: New argument. [native-inputs]: New field. [inputs]: Move texlive-latex-preview to... [propagated-inputs]: ... here. Replace python2-pyparsing with python-parsing. Add texlive-bin, texlive-amsmath, texlive-latex-geometry, texlive-latex-graphics, texlive-latex-base, texlive-latex-xkeyval, texlive-pgf, texlive-pstricks and texlive-xcolor. --- gnu/packages/graphviz.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 2a99c0988e..f2fd90e616 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -415,11 +415,33 @@ (define-public dot2tex "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9")))) (build-system python-build-system) (arguments - `(#:python ,python-2)) - (inputs - (list texlive-latex-preview graphviz)) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "tests" + ;; The test_semicolon test fails for unknown reason + ;; (see: + ;; https://github.com/kjellmf/dot2tex/issues/94). + "-k" "not test_semicolon"))))))) + (native-inputs (list python-pytest)) + (inputs (list graphviz)) (propagated-inputs - (list python2-pyparsing)) + (list python-pyparsing + ;; These TeX dependencies are propagated to make it easier to build + ;; the resulting generated TeX files, which \usepackage them. + texlive-bin + texlive-amsmath + texlive-latex-geometry + texlive-latex-graphics + texlive-latex-base + texlive-latex-preview + texlive-latex-xkeyval + texlive-pgf + texlive-pstricks + texlive-xcolor)) (home-page "https://github.com/kjellmf/dot2tex") (synopsis "Graphviz to LaTeX converter") (description