From patchwork Thu Jan 19 01:36:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 46290 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 DE79027BBEB; Thu, 19 Jan 2023 01:38:16 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 2215A27BBE9 for ; Thu, 19 Jan 2023 01:38:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIJsS-0007GU-LG; Wed, 18 Jan 2023 20:38:04 -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 1pIJsQ-0007GF-UZ for guix-patches@gnu.org; Wed, 18 Jan 2023 20:38:02 -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 1pIJsQ-0003Kd-K6 for guix-patches@gnu.org; Wed, 18 Jan 2023 20:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pIJsQ-0001ab-A6 for guix-patches@gnu.org; Wed, 18 Jan 2023 20:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60941] [PATCH 1/2] gnu: Add python-pypdf. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jan 2023 01:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60941@debbugs.gnu.org Received: via spool by 60941-submit@debbugs.gnu.org id=B60941.16740922286047 (code B ref 60941); Thu, 19 Jan 2023 01:38:02 +0000 Received: (at 60941) by debbugs.gnu.org; 19 Jan 2023 01:37:08 +0000 Received: from localhost ([127.0.0.1]:42134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJrY-0001ZS-5b for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:37:08 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:39600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJrV-0001Yx-S2 for 60941@debbugs.gnu.org; Wed, 18 Jan 2023 20:37:06 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 96D8A1AB68 for <60941@debbugs.gnu.org>; Wed, 18 Jan 2023 17:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674092219; bh=g4YppAYOMliOubPpwj9hqsHuXAdJVOIrqM/m/Wrpn7o=; h=From:To:Subject:In-Reply-To:References:Date:From; b=v3Elibg071+iVgs/7i4/BD/mD2hE5zBAcDGS8jyJZmH1DVDImPTNt0pMjNbtpmWQm P5FqdGmVy0CwHLXWeibe2S7eYvclpXYmqjM0joiQlEQ7A8jmOOGDIVQw0+SnYr0oVs R5MJICjjM828iJ2v5w+jvm/Mq3X7498Mi17aGXF9EZQYZPYqnNtTwm4Xm/8wZptO0o MJUV2Rl3R/yy0TVRSV8O10EhkRMnjWHOQ1XaGlpuwcDSCCkduZuNj4KYjcBU125RWw WWQJSYt0L20fxeqQ2CUtDL3+Dw+fS9L7x1xQILKWiC+mTkDI5qlRr6+789RS4zM3B4 WiY66Ot6T7yKA== From: Vagrant Cascadian In-Reply-To: References: <87ilh3z4vo.fsf@contorta> Date: Wed, 18 Jan 2023 17:36:54 -0800 Message-ID: <87edrrz4nd.fsf@contorta> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From e2082819efee20a72b026eebcfc14af279e424c7 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 18 Jan 2023 16:26:41 -0800 Subject: [PATCH 1/2] gnu: Add python-pypdf. * gnu/packages/pdf.scm (python-pypdf): New varaible. --- gnu/packages/pdf.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4b9d0623fe..cb94c29bde 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1260,6 +1260,45 @@ (define-public pdf2svg converter using the Poppler and Cairo libraries.") (license license:gpl2+))) +(define-public python-pypdf + (package + (name "python-pypdf") + (version "3.2.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pypdf" version)) + (sha256 + (base32 + "1pdq4nbkknx61pk8w75jvx5j921m2676wfkyizsrap5mj92cssxc")))) + (build-system python-build-system) + (arguments + (list #:tests? #f ;pypi source does not contains tests + #:phases #~(modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "flit" "build"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (for-each (lambda (wheel) + (invoke "python" + "-m" + "pip" + "install" + wheel + (string-append "--prefix=" + #$output))) + (find-files "dist" "\\.whl$"))))))) + (native-inputs (list python-flit)) + (propagated-inputs (list python-typing-extensions)) + (home-page "https://github.com/py-pdf/pypdf") + (synopsis + "A pure-python PDF library") + (description + "This package provides a pure-python PDF library capable of splitting, merging, +cropping, and transforming PDF files") + (license license:bsd-3))) + (define-public python-pypdf2 (package (name "python-pypdf2") -- 2.39.0 From patchwork Thu Jan 19 01:38:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 46291 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 ABEEC27BBED; Thu, 19 Jan 2023 01:39:18 +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=-3.7 required=5.0 tests=BAYES_00,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 F330327BBE9 for ; Thu, 19 Jan 2023 01:39:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIJtR-0007wh-2u; Wed, 18 Jan 2023 20:39:05 -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 1pIJtP-0007wR-6x for guix-patches@gnu.org; Wed, 18 Jan 2023 20:39: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 1pIJtO-0003PV-Sc for guix-patches@gnu.org; Wed, 18 Jan 2023 20:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pIJtO-0001cH-Id for guix-patches@gnu.org; Wed, 18 Jan 2023 20:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60941] [PATCH 2/2] gnu: diffoscope: Update to 232. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jan 2023 01:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60941@debbugs.gnu.org Received: via spool by 60941-submit@debbugs.gnu.org id=B60941.16740922946155 (code B ref 60941); Thu, 19 Jan 2023 01:39:02 +0000 Received: (at 60941) by debbugs.gnu.org; 19 Jan 2023 01:38:14 +0000 Received: from localhost ([127.0.0.1]:42138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJsb-0001bD-KO for submit@debbugs.gnu.org; Wed, 18 Jan 2023 20:38:13 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:60100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIJsZ-0001b1-LO for 60941@debbugs.gnu.org; Wed, 18 Jan 2023 20:38:12 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id C8AA61AB68 for <60941@debbugs.gnu.org>; Wed, 18 Jan 2023 17:38:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1674092284; bh=k0RQpkdKKEhoqiZrsHqeqlapJOimXGTW3qupV7GQ4SE=; h=From:To:Subject:In-Reply-To:References:Date:From; b=3aaAJJpHTAAPf3w/pWgFDebqhnBQtmi6syM1Db64/yf0cuBMO6Z/y7S4M+bdxrU2S M/oyALOOoNFZl/qQ1eIP4ahRrrjXr3BajGv/3FFAf5Ajaiwu9x0grCcDnrnh+X7qxu ZilCNwJhZTEGbh/UNJrQySSNQEJOuemEtKKSMLcu6OUAPRYCtXeKjCyMk4BGXbYJ+d FSAKZO0ap9RVxdpc6QJgaUkXziS9ZSZEFck+68XQNOC56uWuE/QcexH2U+tJkqomAz EMjnkY2+d163Ao9hB57wHyelPi2eUNRfy/Fv6MUwRLInZ0Wad5Hxq/s8NMm4yNr49C J201mTsADZfBg== From: Vagrant Cascadian In-Reply-To: <87edrrz4nd.fsf@contorta> References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> Date: Wed, 18 Jan 2023 17:38:00 -0800 Message-ID: <87a62fz4lj.fsf@contorta> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 784d33dad1ff114e4f8043b7b766c785e7fef79f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 18 Jan 2023 11:00:46 -0800 Subject: [PATCH 2/2] gnu: diffoscope: Update to 232. * gnu/packages/diffoscope.scm (diffoscope): Update to 232. [native-inputs]: Add lzip and python-pdf, drop python-pypdf2. [phases]: Add lzip-external-tool and remove-mono-external-tool. --- gnu/packages/diffoscope.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f730d976fe..59875c2e8e 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") - (version "224") + (version "232") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (define-public diffoscope (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qdivsf4yygg2az5018pw0q4169zas3hfqjydd0q3bhdrfpl0q4q")) + (base32 "0zix2m1rlgj7kyx8bkfjb9dnc5idblz6xhmxqq0w3jpnkxxjj8yq")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) @@ -112,6 +112,21 @@ (define-public diffoscope (string-append "[\"" (which "stat") "\",")) (("\\[\"getfacl\",") (string-append "[\"" (which "getfacl") "\","))))) + (add-after 'unpack 'lzip-external-tool + ;; Fixed upstream, remove this phase when updating to + ;; diffoscope 233 + (lambda _ + (substitute* "diffoscope/external_tools.py" + ((".debian.: .lzip.") + "\"debian\": \"lzip\", \"guix\": \"lzip\"")))) + (add-after 'unpack 'remove-mono-external-tool + ;; Fixed upstream, remove this phase when updating to + ;; diffoscope 233 + (lambda _ + (substitute* "diffoscope/external_tools.py" + ;; "guix": "mono", + ((".guix.: .mono.,") + "")))) (add-after 'build 'build-man-page (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "-C" "doc" make-flags))) @@ -160,7 +175,7 @@ (define-public diffoscope python-pytest python-chardet python-h5py - python-pypdf2 + python-pypdf python-progressbar33 abootimg @@ -195,6 +210,7 @@ (define-public diffoscope libarchive llvm-9 lz4 + lzip ocaml odt2txt openssh -- 2.39.0