From patchwork Mon Mar 6 20:23:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Buddelmeijer X-Patchwork-Id: 47753 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 6C2A416D8D; Mon, 6 Mar 2023 21:24:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 6A12516B92 for ; Mon, 6 Mar 2023 21:24:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZIIx-0002hv-7C; Mon, 06 Mar 2023 16:23:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZHNK-0005dm-Mo for guix-patches@gnu.org; Mon, 06 Mar 2023 15:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZHNK-0005ak-Dt for guix-patches@gnu.org; Mon, 06 Mar 2023 15:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZHNK-0002yh-8l for guix-patches@gnu.org; Mon, 06 Mar 2023 15:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62013] [PATCH] gnu: python-pypandoc: Upgrade to 1.7.5 Resent-From: Hugo Buddelmeijer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2023 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62013 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62013@debbugs.gnu.org Cc: Hugo Buddelmeijer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167813420811402 (code B ref -1); Mon, 06 Mar 2023 20:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Mar 2023 20:23:28 +0000 Received: from localhost ([127.0.0.1]:43822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZHMl-0002xp-HE for submit@debbugs.gnu.org; Mon, 06 Mar 2023 15:23:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:45920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZHMk-0002xi-6O for submit@debbugs.gnu.org; Mon, 06 Mar 2023 15:23:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZHMk-0005QO-0W for guix-patches@gnu.org; Mon, 06 Mar 2023 15:23:26 -0500 Received: from mail-server.nl ([2a01:1b0:7999:402::47]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZHMh-0005C0-Nw for guix-patches@gnu.org; Mon, 06 Mar 2023 15:23:25 -0500 Received: from alex.localdomain (unknown [45.80.169.36]) by mail-server.nl (Postfix) with ESMTPSA id D7BF21AD; Mon, 6 Mar 2023 21:23:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=buddelmeijer.nl; s=sslmailserver; t=1678134197; bh=+rd08VIPEiNcVEezsH4sM86dXbOOTwnL3KakKG6mk3Q=; h=From:To:Cc:Subject:Date:From; b=Q6IQceSHnn+makXYCXzxgB0qgrGAYV2HLyg7PFjS+HnbavdS9kr8wTRGARJf5aBLn bWSjeT3si6CWmk2CqoTbtCfzb0h1E4FxdAC4x+UshddK+QjsI1gTF3qlcO0WUuKOjH 3eOHpT/ZJHGMd/WKi4K6RQ31FXsq2K3Zqydz44FU= From: Hugo Buddelmeijer Date: Mon, 6 Mar 2023 21:23:13 +0100 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: none client-ip=2a01:1b0:7999:402::47; envelope-from=hugo@buddelmeijer.nl; helo=mail-server.nl X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Mon, 06 Mar 2023 16:23:32 -0500 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The tests of python-pypandoc 1.6.5 fail; these are fixed in 1.7.5: https://github.com/JessicaTegner/pypandoc/commit/6670e906dccaddcfcdec228e34e0eaffc20ae791 The tests of later versions of python-pypandoc also fail though: https://github.com/JessicaTegner/pypandoc/pull/327 Finally, python-pypandoc requires the pandoc data to be embeded in the binary: https://github.com/jgm/pandoc/blob/main/INSTALL.md#creating-a-relocatable-binary * gnu/packages/python-xyz.scm (python-pypandoc): Upgrade to 1.7.5 * gnu/packages/haskel-xyz.scm (pandoc): Embed data files. --- gnu/packages/haskell-xyz.scm | 3 +++ gnu/packages/python-xyz.scm | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) base-commit: fd4545a47a527fff437abb9991156cfee4137d2b diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 86af842980..d0a367afda 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8315,6 +8315,9 @@ (define-public pandoc (name "pandoc") (arguments (list + ; Create entirely self-contained binary by embedding the data files + ; in the binary itself. Required for python-pypandoc. + #:configure-flags #~(list "-fembed_data_files") #:phases #~(modify-phases %standard-phases (add-after 'register 'remove-libraries diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 83f3ec02ea..1eebff147d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27752,17 +27752,17 @@ (define-public python-safety (define-public python-pypandoc (package (name "python-pypandoc") - (version "1.6.4") + (version "1.7.5") (source (origin (method url-fetch) (uri (pypi-uri "pypandoc" version)) (sha256 (base32 - "149basv4pvzg9zm74cjz68x8s2n5fykyj7prgysb0qfmja73r83f")))) + "0l6a8ngzpx363q2jskxxkx6psfhqrvc4js80dmn16r3vw6m2cb40")))) (build-system python-build-system) (inputs - (list pandoc)) + (list pandoc python-pandocfilters)) (propagated-inputs `(("wheel" ,python-wheel))) (native-inputs