From patchwork Wed Mar 10 09:00:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27569 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 2BD0627BC51; Wed, 10 Mar 2021 09:02:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 270DA27BC50 for ; Wed, 10 Mar 2021 09:02:18 +0000 (GMT) Received: from localhost ([::1]:47472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJujR-0003cZ-B2 for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujC-0003cD-Ee for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujC-0007Lc-7W for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujC-00046X-52 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 01/27] gnu: python-sip: Update to 5.5.0. Add python-sip-4 References: <8b1e2bed-e543-44a2-574b-f3c2c5a14d3f@brendan.scot> In-Reply-To: <8b1e2bed-e543-44a2-574b-f3c2c5a14d3f@brendan.scot> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536688215449 (code B ref 42885); Wed, 10 Mar 2021 09:02:02 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:22 +0000 Received: from localhost ([127.0.0.1]:48635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiX-00040w-86 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:22 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:20378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiT-00040P-Au for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:19 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4DwQzV73H9zQjxJ for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:10 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPYZTIudKNuEy6DnTDLSW65cg1zVmnAPEnvhmTjLsoU=; b=juoVOozQbt7Kqd14cYeDCUFsS7P63RGuqgvNMwB2b1am82IEy31vsWQZ+hSh9ezXOwB0ms 6VzaooUY21vijXTqiRP+ZBgDUf1S5sVBB94roHd+5ObgKomMXwz+zBcRnVdbzjnnAJS6Tx 1YxDHuNtCqAl9TUSrDHBUss22KNmPUE9MSSOlbcjIgh45QadIk0uwwfBDEUI1nDZ3DF2Yg qG3GVUZ8kpj9jc62mkStWOWquuaNYTVkfPtgrZzyoSvGsPy9HbiAJ7CNrbvH5rFWi8Nmac Fuc3lIo+Nr6E29aaXyZBzt8rnIqWxVfOEhGDIr8Y+Cb1aXB9VrMugb6H3mmGnQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id 7nxDq95DkV2V for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:07 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:27 +1100 Message-Id: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -4.78 / 15.00 / 15.00 X-Rspamd-Queue-Id: A88751871 X-Rspamd-UID: 54cd30 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/qt.scm (python-sip): Update to 5.5.0. (python-sip-4): New variable. Rename the old python-sip to python-sip-4. --- gnu/packages/qt.scm | 52 +++++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d921aa87fe..ac5a68e8de 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages regex) #:use-module (gnu packages ruby) @@ -1977,6 +1979,42 @@ and binaries removed, and adds modular support for using system libraries.") (define-public python-sip (package + (name "python-sip") + (version "5.5.0") + (source + (origin + (method url-fetch) + (uri (list (pypi-uri "sip" version) + (string-append "https://www.riverbankcomputing.com/static/" + "Downloads/sip/" version + "/sip-" version ".tar.gz"))) + (sha256 + (base32 + "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx")))) + (build-system python-build-system) + (native-inputs + `(("python" ,python-wrapper))) + (propagated-inputs + `(("python-toml" ,python-toml) + ("python-packaging" ,python-packaging))) + (home-page "https://www.riverbankcomputing.com/software/sip/intro") + (synopsis "Python binding creator for C and C++ libraries") + (description + "SIP is a tool to create Python bindings for C and C++ libraries. It +was originally developed to create PyQt, the Python bindings for the Qt +toolkit, but can be used to create bindings for any C or C++ library. + +SIP comprises a code generator and a Python module. The code generator +processes a set of specification files and generates C or C++ code, which +is then compiled to create the bindings extension module. The SIP Python +module provides support functions to the automatically generated code.") + ;; There is a choice between a python like license, gpl2 and gpl3. + ;; For compatibility with pyqt, we need gpl3. + (license license:gpl3))) + +(define-public python-sip-4 + (package + (inherit python-sip) (name "python-sip") (version "4.19.24") (source @@ -1992,6 +2030,7 @@ and binaries removed, and adds modular support for using system libraries.") (build-system gnu-build-system) (native-inputs `(("python" ,python-wrapper))) + (propagated-inputs `()) (arguments `(#:tests? #f ; no check target #:imported-modules ((guix build python-build-system) @@ -2014,19 +2053,6 @@ and binaries removed, and adds modular support for using system libraries.") "--bindir" bin "--destdir" lib "--incdir" include))))))) - (home-page "https://www.riverbankcomputing.com/software/sip/intro") - (synopsis "Python binding creator for C and C++ libraries") - (description - "SIP is a tool to create Python bindings for C and C++ libraries. It -was originally developed to create PyQt, the Python bindings for the Qt -toolkit, but can be used to create bindings for any C or C++ library. - -SIP comprises a code generator and a Python module. The code generator -processes a set of specification files and generates C or C++ code, which -is then compiled to create the bindings extension module. The SIP Python -module provides support functions to the automatically generated code.") - ;; There is a choice between a python like license, gpl2 and gpl3. - ;; For compatibility with pyqt, we need gpl3. (license license:gpl3))) (define-public python2-sip From patchwork Wed Mar 10 09:00:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27568 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 C29FF27BC55; Wed, 10 Mar 2021 09:02:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5779027BC51 for ; Wed, 10 Mar 2021 09:02:18 +0000 (GMT) Received: from localhost ([::1]:47470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJujR-0003cP-GW for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujB-0003c7-VM for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37151) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujB-0007LU-Np for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujB-00046O-Kb for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 02/27] gnu: python2-sip: Fix build. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536688115437 (code B ref 42885); Wed, 10 Mar 2021 09:02:01 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:21 +0000 Received: from localhost ([127.0.0.1]:48633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiW-00040n-79 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:21 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:33332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiU-00040R-1c for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:18 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4DwQzW73SLzQjwy for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:11 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lCaGLV4WRq9Iya2+XZybwP/OZvD66UeY/JpbkeQLmW0=; b=CM5wX6AhTbd8xBjd9PCavNV7RFQciN5xadVAQMBoG5nP5IaAqDTfNszFXZvb0uuMhzYfmV EZsNqG8YJE2oWadAfkRVBUx7a9qoHBYdmyztyPcoO7EzpRjPozyctWd9FYji9gQELkneoK p4AFfGc9qWXdh2S4VFqKNI17QQTkVv8ihDOn4Tk1VIKIXzAZqvoBYkFse0Nr8BJD4Ti6rV dYm/t/mPfYVfHwwjgfCtlyfjLmtvCfOnQ1+yJ14Yu3vqXwgc/Rydjqi1oKNmEFgWnLAR7d iAqj9OO2nCfmg89aVY7f+wkYevx4G/VSe/BXIYE7U+tUmMnkyeZWODNja7iStQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id P147CptenAlX for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:09 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:28 +1100 Message-Id: <20210310090053.21612-2-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: *** X-Rspamd-Score: 3.53 / 15.00 / 15.00 X-Rspamd-Queue-Id: F162317F1 X-Rspamd-UID: 7fdee2 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/qt.scm (python2-sip): Fix renamed python-sip-4 input. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ac5a68e8de..877e4b698e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2056,7 +2056,7 @@ module provides support functions to the automatically generated code.") (license license:gpl3))) (define-public python2-sip - (package (inherit python-sip) + (package (inherit python-sip-4) (name "python2-sip") (native-inputs `(("python" ,python-2))))) From patchwork Wed Mar 10 09:00:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27570 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 6E22B27BC50; Wed, 10 Mar 2021 09:02:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6A5C027BC52 for ; Wed, 10 Mar 2021 09:02:18 +0000 (GMT) Received: from localhost ([::1]:47476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJujR-0003cm-JI for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujD-0003cJ-9T for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujD-0007Ma-26 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujC-00046s-VI for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 03/27] gnu: veusz: Fix build. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536688315459 (code B ref 42885); Wed, 10 Mar 2021 09:02:02 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:23 +0000 Received: from localhost ([127.0.0.1]:48638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiZ-00041F-95 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:23 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:63594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiV-00040U-Tw for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:21 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4DwQzZ0182zQjwn for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:14 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lkHu2fCJu5sgAKqWb4DjZN+U+gtWArp2YYtfQsSarXE=; b=dT5iec8/4Pej8IcWXnzkf8XOUV60mOEBRIM+Lpc2Dn1CELYEEcOEvPL3hox/XcbQsaZs6o QdIOE+fHPgDd6oqLHGfiWKfRnysA+dV9dPEcr4ZP91DuLPnxia05phyxIxKTnxA7oZTNNP Wmi3ts05VEsAgYy0SE1837OGW+zQWw0SvOd8rnT0+kZS86OK96/4X35jADj2KZ+KImJwmc MNrf+HWu0siOlcVzZnonC10DXq4AGcjOSwRu/rTAgFJI9132isr4hKw5cRgKimFatg5LBJ rUa5oNNCS2kKOiinFWAaqC6ElzMsSm8FQyt40IL2ZIn06V/3ZhstwLFZ9IZlFQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id U5SekrGVgSpe for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:10 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:29 +1100 Message-Id: <20210310090053.21612-3-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.53 / 15.00 / 15.00 X-Rspamd-Queue-Id: 0314317F1 X-Rspamd-UID: 66e747 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/maths.scm (veusz): Fix build that was broken by updating python-sip --- gnu/packages/maths.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6856737bdf..675e1d5b88 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2289,7 +2289,8 @@ ASCII text files using Gmsh's own scripting language.") (native-inputs `(("pkg-config" ,pkg-config) ;;("python-astropy" ,python-astropy) ;; FIXME: Package this. - ("qttools" ,qttools))) + ("qttools" ,qttools) + ("python-sip" ,python-sip-4))) (inputs `(("ghostscript" ,ghostscript) ;optional, for EPS/PS output ("python-dbus" ,python-dbus) From patchwork Wed Mar 10 09:00:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27573 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 C435B27BC50; Wed, 10 Mar 2021 09:02:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 664B427BC51 for ; Wed, 10 Mar 2021 09:02:31 +0000 (GMT) Received: from localhost ([::1]:48252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJuje-00043N-GI for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujE-0003cQ-3F for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37159) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujD-0007Mx-MT for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujD-00046z-IQ for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 04/27] gnu: Add python-pyqt-builder. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536688415472 (code B ref 42885); Wed, 10 Mar 2021 09:02:03 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:24 +0000 Received: from localhost ([127.0.0.1]:48640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiZ-00041I-LG for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:24 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:63596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiX-00040Y-SW for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:22 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4DwQzc2xGrzQjx4 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:16 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+HcI0StU4y25w7SkF+db+K0xqJuZf3wT3WDCdNUt8sQ=; b=gUcacG/c8r41lPQe3UABrVOc2YpbA4YMeHNkF6J/25TyEEL5xt3BbDO6N2U8ex/h2T67ys 1+mcP0+cDeF2Q0SkOUDUIRwf8rzKHPDn7XAakr8H0UK3ktAsEBc4xkzbwa4RtsRuEdOHKH tuW1/Y6+oqPPAckqauu5R3F8eILT+c/uAhYVjr0k0Y3P67jWPbVMe4X+xNS91Pu5oOm9Bx bP7yztlQgTh3sapragDusvym8MqsBck/QUBeA9wLzPtE2UO85atJZMVzhowdQMyhOIQLJk p0K+TRBI46Tx5dMWMcSXJqlu8rTXlrh6JM49yjW/qFRaH5OW00KbDb/8+0nlLQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id XymPbLEsmxq7 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:12 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:30 +1100 Message-Id: <20210310090053.21612-4-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.53 / 15.00 / 15.00 X-Rspamd-Queue-Id: 22B3217CE X-Rspamd-UID: 3eb830 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/qt.scm (python-pyqt-builder): New variable. --- gnu/packages/qt.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 877e4b698e..6435c4b3c3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2326,6 +2326,27 @@ itself.") "--sipdir" sip))))))) (license (list license:gpl2 license:gpl3)))) ; choice of either license +(define-public python-pyqt-builder + (package + (name "python-pyqt-builder") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyQt-builder" version)) + (sha256 + (base32 + "0nh0054c54ji3sm6d268fccf0y5f613spswwgwqd3rnn816hnljl")))) + (build-system python-build-system) + (inputs + `(("python-sip" ,python-sip))) + (home-page "https://www.riverbankcomputing.com/static/Docs/PyQt-builder/") + (synopsis "The PEP 517 compliant PyQt build system") + (description "PyQt-builder is a tool for generating Python bindings for C++ +libraries that use the Qt application framework. The bindings are built on +top of the PyQt bindings for Qt. PyQt-builder is used to build PyQt itself.") + (license (list license:gpl2 license:gpl3)))) + (define-public python-qtpy (package (name "python-qtpy") From patchwork Wed Mar 10 09:00:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27577 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 B97B527BC51; Wed, 10 Mar 2021 09:02:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6789227BC50 for ; Wed, 10 Mar 2021 09:02:53 +0000 (GMT) Received: from localhost ([::1]:49098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJuk0-0004PN-Ku for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujE-0003cW-Fz for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujE-0007N6-8G for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujE-000479-5t for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 05/27] gnu: Add python-pyqt5-sip. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536688815491 (code B ref 42885); Wed, 10 Mar 2021 09:02:04 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:28 +0000 Received: from localhost ([127.0.0.1]:48644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuid-00041m-H8 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:27 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:33334) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuia-00040b-2Y for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:24 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4DwQzf38d4zQjx0 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:18 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vKf/JR7QS28DKlhlAp3QQVSdOM5Kzv0XCS7lsRpJ604=; b=SNlFWs4+yJaNfbPDzQHvQ+GZtjpHVLAiXDGNUKxnie+79UgNXr4zOWnZPMOaWNQa8U8hJG YuU70rW4NoAm+5V8rYMuI93R/gYoFpCP7r8Dh7mPa/o61ov9qwTzopK8coL1pQAAuSEPBh +FjDLnYCa92YXNR0vqxWzlIVwrDoiyMpcAzldlmShy3iDmAttr7wdoV3b7e6n/GAFxsxYD PLKG/YR7XbJN2LI0ywbUUZURISh3y9NCo5U1y8dhIAGMhdyj25uF8eDhdgdbfSCidZo1xQ 9jc5KY9n+WNmuWan0kLW0UkwOa0oyvRw8kJUfunUDhnT3Ezir+0zHiVtw1yYBQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id 9aIXTipYOPNJ for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:14 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:31 +1100 Message-Id: <20210310090053.21612-5-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.53 / 15.00 / 15.00 X-Rspamd-Queue-Id: 2C813188C X-Rspamd-UID: 11a79d 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/qt.scm (python-pyqt5-sip): New variable. --- gnu/packages/qt.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6435c4b3c3..65e61d4dc4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2153,6 +2153,25 @@ framework. The bindings are implemented as a set of Python modules and contain over 620 classes.") (license license:gpl3))) +(define-public python-pyqt5-sip + (package + (name "python-pyqt5-sip") + (version "12.8.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyQt5_sip" version)) + (sha256 + (base32 + "1gg032ys4pccwkdzmdryadc9a4lq85nr05pag9swrsdykbdl9s9h")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;; No test code. + (home-page "https://www.riverbankcomputing.com/software/sip/") + (synopsis "Sip module support for PyQt5") + (description "Sip module support for PyQt5") + (license license:lgpl2.1+))) + (define-public python-pyqtwebengine (package (name "python-pyqtwebengine") From patchwork Wed Mar 10 09:00:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27572 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 739D127BC52; Wed, 10 Mar 2021 09:02:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D14827BC50 for ; Wed, 10 Mar 2021 09:02:31 +0000 (GMT) Received: from localhost ([::1]:48234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJuje-000435-9y for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujE-0003cn-UY for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujE-0007NL-Lg for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujE-00047G-Jm for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 06/27] gnu: python-pyqt: Fix build for new python-sip. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536688815497 (code B ref 42885); Wed, 10 Mar 2021 09:02:04 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:28 +0000 Received: from localhost ([127.0.0.1]:48646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuid-00041o-Rr for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:28 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:15976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuib-00040o-Vn for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:26 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4DwQzh0MwhzQjhF for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:20 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W0fdkIWISmTiI63mAuMjAKiJPkZfzU7CVjUH9HfZL5o=; b=t7YKyTKx0jgCGkxBrQlgXdYW1xUwbpEz/LSW5PXldvtB5O0OpQDVxBhTrRdbvxMFDf9MNI DJLSOpYeCRXqNQaDIdbF6JDavtmiF7gsHpo7+WUpaILY8PikSrnB2lOkK57lMIRinExk/q A63DP9uVtXuesShwKRhF7YRwCnPh8dJhzQNNgD4s8P1pHp8c8MSGaR5s1Uxlo8p5a/IpOa VlTvvgy0eNa/Babm5Yb/bXOhucuj2a2ytJc6eMvfqc/Smaijxosnc5+IuWKXiVsUEfN83T 1hbItNdexHwvpUtt8+3mZjYddkykj5uyg64QLrM9JRZkIzlAhycs4xqpGZNb3w== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id qZRVucNvIxzJ for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:16 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:32 +1100 Message-Id: <20210310090053.21612-6-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.89 / 15.00 / 15.00 X-Rspamd-Queue-Id: BFA718A6 X-Rspamd-UID: b6fc77 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/qt.scm (python-pyqt) [source]: Remove pyqt-public-sip.patch. PyQt uses python-pyqt5-sip now. This patch is still used by python2-pyqt so we don't delete it completely. [inputs]: Add python-pyqt-builder, python-pyqt5-sip [arguments]: Add phase to link PyQt5-sip module. --- gnu/packages/qt.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 65e61d4dc4..b615a74755 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2074,12 +2074,11 @@ module provides support functions to the automatically generated code.") (string-append "https://www.riverbankcomputing.com/static/" "Downloads/PyQt5/" version "/PyQt5-" version ".tar.gz"))) - (file-name (string-append "PyQt5-"version ".tar.gz")) + (file-name (string-append "PyQt5-" version ".tar.gz")) (sha256 (base32 "1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp")) - (patches (search-patches "pyqt-configure.patch" - "pyqt-public-sip.patch")))) + (patches (search-patches "pyqt-configure.patch")))) (build-system gnu-build-system) (native-inputs `(("qtbase" ,qtbase))) ; for qmake @@ -2087,6 +2086,8 @@ module provides support functions to the automatically generated code.") `(("python-sip" ,python-sip))) (inputs `(("python" ,python-wrapper) + ("python-pyqt-builder" ,python-pyqt-builder) + ("python-pyqt5-sip" ,python-pyqt5-sip) ("qtbase" ,qtbase) ("qtconnectivity" ,qtconnectivity) ("qtdeclarative" ,qtdeclarative) @@ -2144,7 +2145,16 @@ module provides support functions to the automatically generated code.") ; installed into the python package's ; site-package directory, which is read-only. "--stubsdir" stubs - "--sipdir" sip))))))) + "--sipdir" sip)))) + ;; Linking here means the sip module can be found without + ;; python-pyqt5-sip needing to be added as an input. + (add-after 'install 'pyqt5-sip + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pyqt5-sip (assoc-ref inputs "python-pyqt5-sip")) + (site "/lib/python3.8/site-packages/PyQt5/") + (.so (first (find-files (string-append pyqt5-sip site) "sip.*")))) + (symlink .so (string-append out site (basename .so))))))))) (home-page "https://www.riverbankcomputing.com/software/pyqt/intro") (synopsis "Python bindings for Qt") (description From patchwork Wed Mar 10 09:00:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27585 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 A2CB827BC50; Wed, 10 Mar 2021 09:03:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2A15127BC51 for ; Wed, 10 Mar 2021 09:03:19 +0000 (GMT) Received: from localhost ([::1]:50752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukQ-00055H-9r for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujF-0003et-ST for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37164) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujF-0007OL-JQ for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujF-00047V-FX for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 07/27] gnu: Add python-ifaddr. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536689215533 (code B ref 42885); Wed, 10 Mar 2021 09:02:05 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:32 +0000 Received: from localhost ([127.0.0.1]:48653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuii-00042S-IK for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:32 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:20396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuig-00041b-1C for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:30 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4DwQzm4B88zQjxK for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:24 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AcHPtJCoPO8GYehhkTqHOOxmUvFkgTYCFZ8MB+Qo2dA=; b=UXZ1cQ9caxD0pSAVnY8UiEDIvlsdenew9rCasr04+L54HcK4s//S+lN45adI0q01gyl7jO XYKuqsNYDhU2Cj/wHEIDS6wVX+gJO/yZghb7XJ9f3filA07ErWtXD5qF2zYrKZ1sHAWab8 yZbAgUJMeeAOvMcrSUzHzuK3X0KfxK0U4Y3163jmJQoOdDXh4vIvv1EAHx8j9bzrqsYZ/2 S7zYJtUEvqEKSX9PuVjPiUb/WWWuF3aAKadtjzYEwTzOr7OPwaeeqKM4ufyauji+PnN/5j pIY3PYNC5yDAzTwrlaqUuAIvRNcaXthdnapF4Q4btWd1J38VLKpwZVyjX1H5NQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id IG2uP8oeQ518 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:18 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:33 +1100 Message-Id: <20210310090053.21612-7-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -4.82 / 15.00 / 15.00 X-Rspamd-Queue-Id: 8E17591E X-Rspamd-UID: 456f99 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/python-xyz.scm (python-ifaddr): New variable. --- gnu/packages/python-xyz.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b1ac3e2e3b..f6bb57d518 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -43,7 +43,7 @@ ;;; Copyright © 2017, 2018, 2019 Kei Kebreau ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki -;;; Copyright © 2017, 2019 Brendan Tildesley +;;; Copyright © 2017, 2019, 2021 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones ;;; Copyright © 2018 Vijayalakshmi Vedantham @@ -20684,6 +20684,32 @@ by Igor Pavlov.") (define-public python2-pylzma (package-with-python2 python-pylzma)) +(define-public python-ifaddr + (package + (name "python-ifaddr") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ifaddr" version)) + (sha256 + (base32 + "150sxdlicwrphmhnv03ykxplyd2jdrxz0mikgnivavgilrn8m7hz")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ (invoke "nosetests")))))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/pydron/ifaddr") + (synopsis + "Cross-platform network interface and IP address enumeration library") + (description + "Cross-platform network interface and IP address enumeration library") + (license license:expat))) + (define-public python2-zeroconf (package (name "python2-zeroconf") From patchwork Wed Mar 10 09:00:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27581 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 D77EE27BC51; Wed, 10 Mar 2021 09:03:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 574D127BC50 for ; Wed, 10 Mar 2021 09:03:03 +0000 (GMT) Received: from localhost ([::1]:49980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukA-0004lo-HQ for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujF-0003dS-Cb for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujF-0007Nx-3N for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujF-00047N-0J for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 08/27] gnu: Add python-zeroconf. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536689015513 (code B ref 42885); Wed, 10 Mar 2021 09:02:04 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:30 +0000 Received: from localhost ([127.0.0.1]:48650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuig-000428-7r for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:30 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:20394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuif-00041O-2i for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:29 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4DwQzl4VyvzQjbj for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:23 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1SR+ENwqFk+GvU8/ZMwz8LvQdAQX9FyBwaR+oJzwbkU=; b=aNHSQkCIC0aVQbKQ7tApk0WnuUISQjSmaNB6weJJsa9NQw+axjlr9dlARFEItdQqDJRlCK 6v/F8Dx3If1d4EVv6elwLLi0s1KoFhEWcdAlZ404V6yA8l7jJ/+/iBse/rW1GJccRlC9rs DTAAfWLr4l3wumQM5zk3PQDAxCr24exn/cJ9PG8kT6ycZuiSGoeMKf4SdCa9U7WkrxuTZU CC/yFz0vLk0kLY2MuaS7w0RLniFHfTqLVrOwLCLHZVQPhdExuLk2dXy38wzxZ7bmOBR/tv y2oEiOxgRdsC2KcQgVd3SEG21QrTPcvB/exPYjY4W0CGaKd2Nzq2o4+fOdDiiw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id feuCW4bxKdfm for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:20 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:34 +1100 Message-Id: <20210310090053.21612-8-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -1.29 / 15.00 / 15.00 X-Rspamd-Queue-Id: 57B0F1871 X-Rspamd-UID: 20ce72 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/python-xyz.scm (python-zeroconf): New variable. --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f6bb57d518..4ac8b0d926 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20710,6 +20710,39 @@ by Igor Pavlov.") "Cross-platform network interface and IP address enumeration library") (license license:expat))) +(define-public python-zeroconf + (package + (name "python-zeroconf") + (version "0.28.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "zeroconf" version)) + (sha256 + (base32 + "0narq8haa3b375vfblbyil77n8bw0wxqnanl91pl0wwwm884mqjb")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + `(("python-ifaddr" ,python-ifaddr))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ ;; Networking isn't available for these tests. + (invoke "nosetests" "-v" + "--exclude" "test_integration_with_listener_ipv6" + "--exclude" "test_launch_and_close_v6_only" + "--exclude" "test_launch_and_close_v4_v6" + "--exclude" "test_launch_and_close")))))) + (home-page "https://github.com/jstasiak/python-zeroconf") + (synopsis "Pure Python mDNS service discovery") + (description + "Pure Python multicast DNS (mDNS) service discovery library (Bonjour/Avahi +compatible).") + (license license:lgpl2.1+))) + (define-public python2-zeroconf (package (name "python2-zeroconf") From patchwork Wed Mar 10 09:00:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27587 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 BC1B627BC52; Wed, 10 Mar 2021 09:03:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5793727BC50 for ; Wed, 10 Mar 2021 09:03:31 +0000 (GMT) Received: from localhost ([::1]:51630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukc-0005SO-JB for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujG-0003fW-Ab for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37165) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujF-0007Oz-W7 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujF-00047c-TH for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 09/27] gnu: Add python-pyannotate. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536689515549 (code B ref 42885); Wed, 10 Mar 2021 09:02:05 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:35 +0000 Received: from localhost ([127.0.0.1]:48656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuik-00042f-Rl for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:35 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:15978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuih-00041d-9e for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:31 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4DwQzn5w1tzQjmh for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:25 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tT1YIPNxh8c6oXH22B3U3AALmqOykjHO8d1usG0VLak=; b=DNujkylCYkUep+vLvovysPuJ98vcIM205MwBuvaNXvsk7oqQqY5yL54iy2n4yRaWy4Vf3Q 4M6xYa6ClvFeBEXHR1r/HXl4NzbdzkMX+XlWqurEcDoAWHPLSeNh7vG1Gi+5abwlj5+NeB Gd/K5f5PSFf08bMMQRgvnenKq4nX1Xf3hVXM0j3qHZ2l76cMAGAUfcQGI8CFWdoKpHMPx4 wZC9BZEG+pTQ+kALNQSnDmuptC0vJv25skb8cRKdOvUVxmToT3iE6ZNFI+gJ2Dwg6j1Rlg TLzKlttljSnxJ/t0hl/2MBTWcDZQAHUtCGuOYLRSBppR7ZV5o91C12scxYZ96w== Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id 3wI3wAOWDoDl for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:21 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:35 +1100 Message-Id: <20210310090053.21612-9-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -9.71 / 15.00 / 15.00 X-Rspamd-Queue-Id: 669941889 X-Rspamd-UID: 5be270 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/python-check.scm (python-pyannotate): New variable. --- gnu/packages/python-check.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 15efdd3297..0de3a779b6 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2021 Sharlatan Hellseher +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1156,6 +1157,28 @@ any Python VM with basically no runtime overhead.") ;; mypyc/lib-rt/getargs.c (license (list license:expat license:psfl)))) +(define-public python-pyannotate + (package + (name "python-pyannotate") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyannotate" version)) + (sha256 + (base32 + "16bm0mf7wxvy0lgmcs1p8n1ji8pnvj1jvj8zk3am70dkp825iv84")))) + (build-system python-build-system) + (propagated-inputs + `(("python-mypy-extensions" ,python-mypy-extensions) + ("python-six" ,python-six))) + (home-page + "https://github.com/dropbox/pyannotate") + (synopsis + "PyAnnotate: Auto-generate PEP-484 annotations") + (description + "PyAnnotate: Auto-generate PEP-484 annotations") + (license license:asl2.0))) (define-public python-eradicate (package (name "python-eradicate") From patchwork Wed Mar 10 09:00:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27580 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 4885F27BC51; Wed, 10 Mar 2021 09:03:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0285527BC50 for ; Wed, 10 Mar 2021 09:03:03 +0000 (GMT) Received: from localhost ([::1]:49950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukA-0004kz-6O for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujI-0003kX-G3 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37170) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujI-0007Ri-7F for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujI-00048D-4l for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 10/27] gnu: Add python-multivolumefile. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536690515632 (code B ref 42885); Wed, 10 Mar 2021 09:02:08 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:45 +0000 Received: from localhost ([127.0.0.1]:48672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiu-000442-O6 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:45 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:15988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiq-00042q-QQ for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:41 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4DwQzz2VL9zQjxQ for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:35 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uQQZyN3tA9sOnIKE1ymAPC7Xuoh1F8lUCXXslUarLvE=; b=g/Ud6zHYE5iLDxKXwjMzVmYRVCJogTzoDN1PiJ7/rT8FUUqse9c8LJ7fgQtKemfM/tQ0ym aqjw1bsIAQjfjpz+1DBUOqHhsdwK6dG5EGsNk4OsHn3xrp3/rmq+PackoPq/6S9aAlLXjo y910cHVopKlmElXBqJ8qeBl7FhZlH9zKpW9BogsbYk0ejq6idRrYywRTPBEc1LKf8O56iL P0sekBCTM+ejZZezMH9YUgNItizQCgjdau40DteLkB7LhAqAXlGBm5ZJ8R15+CP0CsGKjk HMRkVi+ma8UjjID6+KGKK5wgNGyyf2fmPWYtpVMqNTuu42pcNUp3K5ndwkajGg== Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id DMSWD3S9Zn8g for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:23 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:36 +1100 Message-Id: <20210310090053.21612-10-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -10.87 / 15.00 / 15.00 X-Rspamd-Queue-Id: 23D61186A X-Rspamd-UID: d82951 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/python-compression.scm (python-multivolumefile): New variable. --- gnu/packages/python-compression.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 6b2da5f925..fe73dd38cb 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,9 +36,37 @@ #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx)) +(define-public python-multivolumefile + (package + (name "python-multivolumefile") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "multivolumefile" version)) + (sha256 + (base32 + "0j46wab4b09s3favjzp3zs1cn2sn8pr7qyngs5wn31hpqqxbbz76")))) + (build-system python-build-system) + (native-inputs + `(("python-pep517" ,python-pep517) + ("python-setuptools" ,python-setuptools) + ("python-setuptools-scm" ,python-setuptools-scm/next) + ("python-coverage" ,python-coverage) + ("python-coveralls" ,python-coveralls) + ("python-pyannotate" ,python-pyannotate) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://github.com/miurahr/multivolume") + (synopsis "Treat multiple files as one") + (description "MultiVolumefile is a python library to provide a file-object +wrapping multiple files as virtually like as a single file.") + (license license:lgpl2.1+))) + (define-public python-lzo (package (name "python-lzo") From patchwork Wed Mar 10 09:00:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27571 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 6675827BC51; Wed, 10 Mar 2021 09:02:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 803A827BC50 for ; Wed, 10 Mar 2021 09:02:25 +0000 (GMT) Received: from localhost ([::1]:47684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJujY-0003kl-Kz for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujG-0003gY-OE for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37166) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujG-0007PN-Dm for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujG-00047j-AQ for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 11/27] gnu: Add python-ppmd-cffi. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536689615563 (code B ref 42885); Wed, 10 Mar 2021 09:02:06 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:36 +0000 Received: from localhost ([127.0.0.1]:48659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuim-00042r-6R for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:36 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:63608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuik-000421-EU for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:34 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4DwQzr6xhlzQjwn for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:28 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8O7/9GUEpRo92gbwKdsoI78kqFIXywwtHr21eLrqIJk=; b=enm9ApeUsSjCfj1LpGL7056rr3oX/FxS+hsKV/5E/U+4a5qH1eyY84gqosA7q5nypnSCp6 m/ztFyzff2Z3MnNLfGhgU8JQ9jpMWUnrR/n58+EY7gys5iCvoniy/HXZQEzHkwh5b5DjKk OsKcC8H9TsYtyKJ6CsTKwrh9NZQBIYME9P9+4GyDvoLIeOSBJEzc0niZeS4O11DxBR6gcN KnNxUuoToXT+TGYCQD8obt0IMwHMIDatDAop3vw0n+RHb9vML/nCfNqaKPfzFppMLD7Tdi 9DQnpInGdC5MO/ScWpQx5h9KR4kHzT3AA+ITiuZBsrrtg5vhDmA34cmvZxWC3Q== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id l27vIVS0EV27 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:25 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:37 +1100 Message-Id: <20210310090053.21612-11-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -0.93 / 15.00 / 15.00 X-Rspamd-Queue-Id: B98484F5 X-Rspamd-UID: a7eed5 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/python-compression.scm (python-ppmd-cffi): New variable. --- gnu/packages/python-compression.scm | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index fe73dd38cb..101211019b 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -31,6 +31,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages libffi) #:use-module (gnu packages compression) #:use-module (gnu packages check) #:use-module (gnu packages maths) @@ -67,6 +68,35 @@ wrapping multiple files as virtually like as a single file.") (license license:lgpl2.1+))) +(define-public python-ppmd-cffi + (package + (name "python-ppmd-cffi") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ppmd-cffi" version)) + (sha256 + (base32 + "01wcd9l6pp6hivdmd275qh9dhcwficjqfl67hxix5n07vvq7jzz0")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cffi" ,python-cffi))) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-setuptools-scm" ,python-setuptools-scm/next) + ("python-pep517" ,python-pep517) + ("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "http://github.com/miurahr/ppmd") + (synopsis "Compression/decompression library") + (description + "PPMd is a compression algorithm library using the Prediction by Partial +Matching statical technique. It is by RAR and 7-Zip as one of several possible +methods.") + (license license:lgpl2.1+))) + (define-public python-lzo (package (name "python-lzo") From patchwork Wed Mar 10 09:00:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27576 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 B7CAE27BC50; Wed, 10 Mar 2021 09:02:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6C88B27BC50 for ; Wed, 10 Mar 2021 09:02:49 +0000 (GMT) Received: from localhost ([::1]:49086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJujw-0004P6-MS for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujH-0003hW-5O for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37167) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujG-0007QQ-Rt for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujG-00047r-P4 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 12/27] gnu: python-zstandard: Update to 0.15.2. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536689815579 (code B ref 42885); Wed, 10 Mar 2021 09:02:06 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:38 +0000 Received: from localhost ([127.0.0.1]:48662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuio-000438-G9 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:38 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:15982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuil-000429-No for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:36 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4DwQzt1vQnzQjhF for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:30 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k7w+j6/j/yhft4Gvk6ee+8DX6BkoCBB7S0RgplVzQHs=; b=rULzlPA8+7m4zKQcxMkuHFerxRyVTcVrMsYxAq9bsPk7NsMpoIeLsZo72d5IyOJpKdAzlA 8sVrZfae0Qsc+MRf0mtcxUKABbGWPtgFUTVUWNfkafkM3OxSlxcuIjYKszViWmtoHplFAu SSBvpOpXKY4UGggxIn10Wrmj8VtEToyeeiEvhpKk+5DMhH5u0OyG1AYcau6P/H908v30lo ezK6J7Azsbq+wze3tNOo6fhKzPdaGb9Mg1meOXE8UOQQxpZmtiPpUGlgK9dy+CU3pg56t3 q4E058h0LQ3PHvACeblEqS0tXadz0Me2lfppg6N4pVykmWeg898169snZrHtNg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id sX49PCY2xnx7 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:27 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:38 +1100 Message-Id: <20210310090053.21612-12-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.53 / 15.00 / 15.00 X-Rspamd-Queue-Id: 4722C1862 X-Rspamd-UID: 064828 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/python-compression.scm (python-zstandard): Update to 0.15.2. --- gnu/packages/python-compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 101211019b..860b4ee342 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -348,13 +348,13 @@ wrapper. It provides a backport of the @code{Path} object.") (define-public python-zstandard (package (name "python-zstandard") - (version "0.13.0") + (version "0.15.2") (source (origin (method url-fetch) (uri (pypi-uri "zstandard" version)) (sha256 - (base32 "0q9msi00s93iqm8vzd839r7yc51gz54z90h5bckqyjdxa6vxijz5")))) + (base32 "0by9z7nxnkzhmza075q6q91rs8lnpf91129k8ppv7kymbwshipjj")))) (build-system python-build-system) (native-inputs `(("python-hypothesis" ,python-hypothesis))) From patchwork Wed Mar 10 09:00:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27574 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 6298227BC51; Wed, 10 Mar 2021 09:02:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D63027BC50 for ; Wed, 10 Mar 2021 09:02:32 +0000 (GMT) Received: from localhost ([::1]:48320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJujf-00045b-Ar for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujH-0003ip-Ly for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujH-0007Qu-B5 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujH-00047y-8N for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 13/27] gnu: Add python-pyzstd Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536690215603 (code B ref 42885); Wed, 10 Mar 2021 09:02:07 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:42 +0000 Received: from localhost ([127.0.0.1]:48666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuir-00043T-Pl for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:42 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:15986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuio-00042Z-4A for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:38 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4DwQzw4fv5zQjmh for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:32 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x2FZqBtGRhkjI1TVhdYqH/sUuiWGE2rIyZAPzE1cJw4=; b=YKHu5vPQo/F26rlLIYNdCM149aK2vLufHaEgvrMEJn4IWYNbh8lN9k2eJNyunhK6umxt7t 7UX8r9FMZnsvNt4bLlMfBzYjWvMpexMs8TUgohSRuQWQEX0S4mzSqNWPgnUbiMP5rahsx0 /qoKUsbRArXQhujsyh41S/JMGXmhwustb4/fhQnxrSatG88ZrnL7skHsjbau3EXRCuaS0y I0dqf9Q+S+XdyWW8xCHWGbM3GFLLPra/Cvw2MuBhZjp9VLiHkOqJ7axhjNjXLdrcOWQmlz CD0a60UBhNMnM/zHVycYWJrK27d9r0ptdXEqP13DySxOYgX/Wg7Zi+3qtXc/gw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id GHvnbRrBaiZR for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:29 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:39 +1100 Message-Id: <20210310090053.21612-13-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -1.34 / 15.00 / 15.00 X-Rspamd-Queue-Id: 5D4BF17CE X-Rspamd-UID: 7dff2a 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/python-compression.scm (python-pyzstd): New variable. --- gnu/packages/python-compression.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 860b4ee342..51e1fb3ccf 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -364,3 +364,21 @@ wrapper. It provides a backport of the @code{Path} object.") the Zstandard compression library. A C extension and CFFI interface are provided.") (license license:bsd-3))) + +(define-public python-pyzstd + (package + (name "python-pyzstd") + (version "0.14.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyzstd" version)) + (sha256 + (base32 + "1d3mngs45w2p490vrq5ymd2wz4lp15phmks1ilcx4k7amgibml3d")))) + (build-system python-build-system) + (home-page "https://github.com/animalize/pyzstd") + (synopsis "Zstandard bindings for Python") + (description "Python bindings to Zstandard (zstd) compression library, the +API is similar to Python's bz2/lzma/zlib module.") + (license license:bsd-3))) From patchwork Wed Mar 10 09:00:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27578 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 513EB27BC51; Wed, 10 Mar 2021 09:02:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 17E1A27BC50 for ; Wed, 10 Mar 2021 09:02:54 +0000 (GMT) Received: from localhost ([::1]:49180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJuk1-0004RO-8l for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujI-0003jP-2H for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujH-0007RB-OY for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujH-000486-M9 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 14/27] gnu: Add python-bcj-cffi. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536690215615 (code B ref 42885); Wed, 10 Mar 2021 09:02:07 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:42 +0000 Received: from localhost ([127.0.0.1]:48669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuis-00043c-71 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:42 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:20408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiq-00042c-09 for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:40 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4DwQzy3vbszQjxL for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:34 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KLHoE0GPbXwSgiEDZ/8InyhJLPy3hSfsY5WAI36FmDE=; b=Nmn5PhQqGb3yFdMh1DRZevPVzqQSXaXinOJdiBJTbh3gD3UmlVO3XAldRR7XINnWhiHiEO CkOkklTd5IESO9ntXIW/OY2Y/tGNyOytuz6BzIir4mId10rtkFcdm7ANSIx+3bnrf2ZXv9 Q0gKikypFJRHmFzzyujsuSH4I5BiiY67KxwI8DdUDI0d6UD3WkMCh36N94PMVNC2HNidIi LwWkLef/h6KmhQn17STR95STp57LmmlwZsN33IsHoKAAFBqEf2CKF2NrLxY80dYqaF7sxG JSN0RDD173DUIa09Jck1sY5ZmwYvnYUdFejR5r+sYzEi6+OUtE9AWCGhXzVd9A== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id EMXldy6UZmHZ for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:30 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:40 +1100 Message-Id: <20210310090053.21612-14-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.89 / 15.00 / 15.00 X-Rspamd-Queue-Id: 3B8BD91E X-Rspamd-UID: 6f909b 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/python-compression.scm (python-bcj-cffi): New variable. --- gnu/packages/python-compression.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 51e1fb3ccf..a25a658ff2 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx)) @@ -68,6 +69,32 @@ wrapping multiple files as virtually like as a single file.") (license license:lgpl2.1+))) +(define-public python-bcj-cffi + (package + (name "python-bcj-cffi") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bcj-cffi" version)) + (sha256 + (base32 + "1jcczrb8zgg6w7v76w1wpz3nw75fghk3xwxkn09ll7kck7sdf68d")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cffi" ,python-cffi) + ("python-toml" ,python-toml) + ("python-setuptools-scm" ,python-setuptools-scm/next))) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "http://github.com/miurahr/bcj-cffi") + (synopsis "bcj algorithm library") + (description "bcj algorithm library") + (license license:lgpl2.1+))) + (define-public python-ppmd-cffi (package (name "python-ppmd-cffi") From patchwork Wed Mar 10 09:00:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27582 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 088A627BC50; Wed, 10 Mar 2021 09:03:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5F43D27BC52 for ; Wed, 10 Mar 2021 09:03:03 +0000 (GMT) Received: from localhost ([::1]:50022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukA-0004me-JL for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujI-0003lc-Va for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujI-0007SH-M6 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujI-00048K-If for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 15/27] gnu: Add python-py7zr. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536690515639 (code B ref 42885); Wed, 10 Mar 2021 09:02:08 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:45 +0000 Received: from localhost ([127.0.0.1]:48674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiv-000444-3L for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:45 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:63616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuir-000434-SU for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:42 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4DwR002wYpzQjwn for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:36 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oJQHG8dIoQKPebjTZonH2at2ZMhX0yBiQBTHZr4kH9Y=; b=isyR39tWM4kwLRggqlyEB53nrDvR4WNcB4YUYyXusYQUm6CkcKHyin8ELEpSy6GXlB3xIW aAMu5NvcmDOO8Q6XnuU5zgLmviXOxaXmCtnXuCAAZPzJ8JXRAsZt5s3hs2CHRAASc0J+1X Qz6h5S0x+4S1rLeLt8Dm3ey2kYVrHZI3IRHgLWdIT6Dp4nBTaCPtbCt0kD2CYpvGY1ExCg Kkzrbso1Wjc/pd0ZT8iweui/bNP1ConL5LqpsVQ6MTasguHxehk4mfo+uPTVOJ67VCvfXG 86e4ro0hL6si2zank8NKSyiTzVxFSeowZ8gf9R+V3uFygKM4SmcBRh9rwS9D8Q== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id APbbNrYFvG8s for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:32 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:41 +1100 Message-Id: <20210310090053.21612-15-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.89 / 15.00 / 15.00 X-Rspamd-Queue-Id: 27BB0186B X-Rspamd-UID: bfd447 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/python-compression.scm (python-py7zr): New variable. --- gnu/packages/python-compression.scm | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index a25a658ff2..9cc5a1b679 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx)) @@ -124,6 +125,45 @@ Matching statical technique. It is by RAR and 7-Zip as one of several possible methods.") (license license:lgpl2.1+))) +(define-public python-py7zr + (package + (name "python-py7zr") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "py7zr" version)) + (sha256 + (base32 + "1zmgp7yax328fj8yj8pj4l7yh78hp727j6wk12vfi6nmi82wl32i")))) + (build-system python-build-system) + (propagated-inputs + `(("python-bcj-cffi" ,python-bcj-cffi) + ("python-multivolumefile" ,python-multivolumefile) + ("python-ppmd-cffi" ,python-ppmd-cffi) + ("python-pycryptodome" ,python-pycryptodome) + ("python-pyzstd" ,python-pyzstd) + ("python-texttable" ,python-texttable) + ("python-zstandard" ,python-zstandard))) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-setuptools-scm" ,python-setuptools-scm/next) + ("python-coverage" ,python-coverage) + ("python-coveralls" ,python-coveralls) + ("python-libarchive-c" ,python-libarchive-c) + ("python-py-cpuinfo" ,python-py-cpuinfo) + ("python-pyannotate" ,python-pyannotate) + ("python-pytest" ,python-pytest) + ("python-pytest-benchmark" ,python-pytest-benchmark) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-remotedata" ,python-pytest-remotedata) + ("python-pytest-timeout" ,python-pytest-timeout))) + (home-page "https://github.com/miurahr/py7zr") + (synopsis "Pure python 7-zip library") + (description "py7zr is a library and utility to support 7zip archive +compression, decompression, encryption and decryption written in Python.") + (license license:lgpl2.1+))) + (define-public python-lzo (package (name "python-lzo") From patchwork Wed Mar 10 09:00:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27583 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 BF57F27BC51; Wed, 10 Mar 2021 09:03:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 84CD927BC50 for ; Wed, 10 Mar 2021 09:03:18 +0000 (GMT) Received: from localhost ([::1]:50712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukP-000546-Nd for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujJ-0003mh-Gt for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujJ-0007Si-1k for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujI-00048S-Vf for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 16/27] gnu: python-markdown: Update to 3.3.4. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536690515646 (code B ref 42885); Wed, 10 Mar 2021 09:02:08 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:45 +0000 Received: from localhost ([127.0.0.1]:48676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiv-00044C-DL for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:45 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:20418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuis-000436-W3 for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:43 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4DwR013ysTzQjbj for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:37 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=45yMaXzYeIFmoO0kIGh4l1xVQCinBpstqyj+rXKGjj0=; b=Mqs82oZsoeqUu/rTS5Jmx37/9tiAtTTbgpqah6VcDu9NVDqSuUQclohf4wiJ2qThiEDcdh LywFqmTXJA/L9NPrlsPa8q9cUx6cvLy2icuQk1TKtStXpIYUJZ/zmUq6GvnlrIFGwgAUuI xVgXIZCBzb7he/TKh8vs1WBm+E1SmZo3obS/bArXsuju//piFZP3jZc5RbD8mJV/iHo2kV /97dBaBHjn+S0Syxbw3rpe+TL8aPr0Vg2xBK5vWo7YcPtyhR7olAOE9/REBE4g6y4uCZcO iYtsVpAlqanNNkoyytN7GPK9r8zjgNQwT7qB8Mu7MNltWAQJVVAZdbG7jdmnAg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id j4OCEUVSKZhY for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:34 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:42 +1100 Message-Id: <20210310090053.21612-16-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: *** X-Rspamd-Score: 3.48 / 15.00 / 15.00 X-Rspamd-Queue-Id: 9E7CB1264 X-Rspamd-UID: 370350 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/python-xyz.scm (python-markdown): Update to 3.3.4. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4ac8b0d926..0bf7c31ede 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8775,14 +8775,14 @@ Python.") (define-public python-markdown (package (name "python-markdown") - (version "3.2.1") + (version "3.3.4") (source (origin (method url-fetch) (uri (pypi-uri "Markdown" version)) (sha256 (base32 - "00k91gwhxnm8jdnm2v5xjz9irj6dbi7afywz2hpakqdbxs1ydzlh")))) + "0jbs73nincha8fkfxx267sfxac6pl0ckszjbqbb8gk4dhs8v9d9i")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose) From patchwork Wed Mar 10 09:00:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27584 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 3526E27BC52; Wed, 10 Mar 2021 09:03:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F18D627BC50 for ; Wed, 10 Mar 2021 09:03:18 +0000 (GMT) Received: from localhost ([::1]:50754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukQ-00055M-4V for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujJ-0003nr-Qh for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujJ-0007TM-FR for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujJ-00048Z-Cs for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 17/27] gnu: python-feedparser: Update to 6.0.2. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536691015675 (code B ref 42885); Wed, 10 Mar 2021 09:02:09 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:50 +0000 Received: from localhost ([127.0.0.1]:48681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiz-00044k-Pn for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:50 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:33352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiv-00043M-BC for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:45 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4DwR036Q6szQjmg for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:39 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l7mMS/YAuYhPmtfTxvDCAzeN6wbMW2okfGvX8gdH3Ho=; b=ZETiFxAcuTxIxOHqFKfwWtLxONaozZolZgApblCTbk4BlEUyaXCSLMSFvbhmXdoBOcgWkQ nwncNXqvuSs6EyKYAGAejFUzcHPrfLkR6eW9xg2/iDwjNEEWC6ZN/MZGgFYRZ0jPBgZVTn SAmEIZlnFvMzd6jKFegOt7qjYbN9XX+Tj/lsjX2NHdaan3sE/4iaZTPqeWfH2nydzMp1Xw r6E8PvdSSV8UZVp6aodVkZAoH1Xn/VKoX6UZer+ZhuciWe1H6Hk0MKtkHNWhS8cLmScl50 5sT7KP2OUbOhMZWmxUVSRhMtVkmNEIBobQgGshp0/uQDSeRdhN+Ej3ClAs0J7Q== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id Zk6iIxvIcNhW for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:37 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:43 +1100 Message-Id: <20210310090053.21612-17-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.12 / 15.00 / 15.00 X-Rspamd-Queue-Id: E41521885 X-Rspamd-UID: c1a86e 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/web.scm (python-feedparser): Update to 6.0.2. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 836328d758..ea0155cb54 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4610,14 +4610,14 @@ their web site.") (define-public python-feedparser (package (name "python-feedparser") - (version "5.2.1") + (version "6.0.2") (source (origin (method url-fetch) - (uri (pypi-uri "feedparser" version ".tar.bz2")) + (uri (pypi-uri "feedparser" version ".tar.gz")) (sha256 (base32 - "00hb4qg2am06g81mygfi1jsbx8830024jm45g6qp9g8fr6am91yf")))) + "0x0hm9brh3j71645pydvlkrwxaaca9dnwd7xahwjyjaz882s200v")))) (build-system python-build-system) (arguments '(#:tests? #f)) From patchwork Wed Mar 10 09:00:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27575 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 F1B7127BC51; Wed, 10 Mar 2021 09:02:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AC29827BC50 for ; Wed, 10 Mar 2021 09:02:38 +0000 (GMT) Received: from localhost ([::1]:48572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJujl-0004CH-Sk for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujK-0003pA-74 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujJ-0007U1-UR for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujJ-00048h-Rp for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 18/27] gnu: python-poppler-qt5: Fix build. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536691015681 (code B ref 42885); Wed, 10 Mar 2021 09:02:09 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:50 +0000 Received: from localhost ([127.0.0.1]:48683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj0-00044m-27 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:50 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:63626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuix-00043a-5k for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:47 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4DwR0554CtzQjx7 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:41 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6B95hzByIG5YEgKfrmvsSPVq84aiQXbYdtHDVb+tLZU=; b=TEgHOONHqOZ526RqdS2JpSBnoVJ5eB/0hht5BwOANFe1jA3Mrt8JDg7F9tXasnXZc1oCTZ TAYiDCmtIOXwWVK1zWfIhLZTlaEHLKqFVR/5qDusiWHNGUs1elvFIok4mhLgPihJz9NeXn qIbIfJyWXek+hUJ406JAL49/4AhkcvGjrJsR3Rjq6DARZ6gOrAPNDoZbTb7AhqbqCdOMpL YDJp5oRRFynvDdVjZlxO13nnN/hMwJbSS23RsLqC6SXy6Xk/Wygn0GX7nd733eUUaNM5sK /WrFMeLkubAbT++Uvx1BnW7+H29VzYSpne1LVKTXn7vL/ElcNrUwezQ724G77A== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id t_jQqMSs-hX4 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:38 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:44 +1100 Message-Id: <20210310090053.21612-18-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.48 / 15.00 / 15.00 X-Rspamd-Queue-Id: B2A241857 X-Rspamd-UID: 14fa7a 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/pdf.scm (python-poppler-qt5): Keep using python-sip 4 since it doesn't work with 5. --- gnu/packages/pdf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e81c3caf87..a931f04ff7 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -346,7 +346,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("python-sip" ,python-sip) + `(("python-sip" ,python-sip-4) ("python-pyqt" ,python-pyqt) ("poppler-qt5" ,poppler-qt5) ("qtbase" ,qtbase))) From patchwork Wed Mar 10 09:00:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27590 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 288AB27BC52; Wed, 10 Mar 2021 09:03:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DE45527BC51 for ; Wed, 10 Mar 2021 09:03:39 +0000 (GMT) Received: from localhost ([::1]:52460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukl-0005m2-26 for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujK-0003pp-KA for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37175) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujK-0007UA-AD for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujK-00048o-88 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 19/27] gnu: python-poppler-qt5: Update to 21.1.0. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536691415703 (code B ref 42885); Wed, 10 Mar 2021 09:02:10 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:54 +0000 Received: from localhost ([127.0.0.1]:48686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj4-00045C-A4 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:54 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:63628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuiy-000440-S3 for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:49 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4DwR072tB2zQjwn for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:43 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T1F5mhS0NLxhTeyVIZHivBPj3qQU87BhAdbWr5jEmT0=; b=OsaoZS1qPcDIVcatyfOmv/GqHqiHZPzNIGxW+1DBULrdq0XsQi3TADxMQQnD28JVyFAPIe Ronng83G60bn/NLEINhTkwLYxC/6HsfGL6+99YRuY//uMlHbJctu54odsLAwe1fZ7DX3xe Gw4T3hRlnBdFaPkbLoKJJP/opaGTV/UhZgiJUDt4j8+1ubGuKre8V/SmzEEvSRRji48Y/t Jn25TZCW5EOsG083+6ViPuukuEj3wvmuRLYNrmA+Btr9Lvnjsp9QbXsA6IMlyZTWfBMGAe eprIpm8PE512WD13soKcX06pTNxXSh5ygVr/okm5g3A8agw5NdmhM2TcDiNMPQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id g35jn7Q_Gb-B for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:40 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:45 +1100 Message-Id: <20210310090053.21612-19-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.89 / 15.00 / 15.00 X-Rspamd-Queue-Id: 6EB51186F X-Rspamd-UID: 2680f4 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/pdf (python-poppler-qt5): Update to 21.1.0. (Unrelated to Calibre, just updating this since I updated python-sip.) --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index a931f04ff7..520f4b60f9 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -316,14 +316,14 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (define-public python-poppler-qt5 (package (name "python-poppler-qt5") - (version "0.24.2") + (version "21.1.0") (source (origin (method url-fetch) (uri (pypi-uri "python-poppler-qt5" version)) (sha256 (base32 - "0l69llw1fzwz8y90q0qp9q5pifbrqjjbwii7di54dwghw5fc6w1r")))) + "0b82gm4i75q5v19kfbq0h4y0b2vcwr2213zkhxh6l0h45kdndmxd")))) (build-system python-build-system) (arguments `(;; There are no tests. The check phase just causes a rebuild. From patchwork Wed Mar 10 09:00:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27586 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 33FC227BC51; Wed, 10 Mar 2021 09:03:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EC88D27BC50 for ; Wed, 10 Mar 2021 09:03:30 +0000 (GMT) Received: from localhost ([::1]:51560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukc-0005Qg-32 for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujL-0003qK-5w for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37176) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujK-0007UI-Mt for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujK-00048v-Kb for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 20/27] gnu: Add python-pychm. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536691515711 (code B ref 42885); Wed, 10 Mar 2021 09:02:10 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:55 +0000 Received: from localhost ([127.0.0.1]:48688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj4-00045E-Ha for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:54 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:33360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj1-00044U-Bq for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:51 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4DwR096c1kzQjmg for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:45 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uq138XQfK1ywobEkjuZK/eLMHrZEx4dq0rHsI8xozn0=; b=rbTeKQ0Jw0WHCd2Rf67rnwuRfIU7HBdaq1UxK1Hs6LoAkXmyh59x2l/e1s8IDLpeIeEobW rMT2qO78+stFEnGVCJC759g1S/si+RqcIToeiy060M+CokktYO85AA8ysgUseLvyMPlUzD US80l2c0iZnxbrxvBvjcovCTFESg7bofTcP2jnYi/cNAha8kufjwHIhlxrHDoG+xwdSbvE lruxWcna7KLqfioqM8oz7gJHvPha4QIp0KoJFZxPXgHPfLZJ1M0Tg7gw5+m0S9gTYGo8i+ 6r6uBLsiIXHIvzFdTXcYqLUJDr1UAn+BzDthPb5J8o+szwEHU/uIBFiB15KcJw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id vGuLny8G-M0j for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:42 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:46 +1100 Message-Id: <20210310090053.21612-20-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -1.34 / 15.00 / 15.00 X-Rspamd-Queue-Id: AC8C1185A X-Rspamd-UID: bf8566 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/ebook.scm (python-pychm): New variable. --- gnu/packages/ebook.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 47bbd1a789..763e3eba2b 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -88,6 +88,26 @@ (description "CHMLIB is a library for dealing with ITSS/CHM format files.") (license license:lgpl2.1+))) +(define-public python-pychm + (package + (name "python-pychm") + (version "0.8.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pychm" version)) + (sha256 + (base32 + "0wpn9ijlsmrpyiwg3drmgz4dms1i1i347adgqw37bkrh3vn6yq16")))) + (build-system python-build-system) + (inputs + `(("chmlib" ,chmlib))) + (home-page "https://github.com/dottedmag/pychm") + (synopsis "Python package to handle CHM files") + (description + "Python package to handle CHM files") + (license license:gpl3))) + (define-public calibre (package (name "calibre") From patchwork Wed Mar 10 09:00:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27588 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 0E07327BC50; Wed, 10 Mar 2021 09:03:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7171E27BC51 for ; Wed, 10 Mar 2021 09:03:31 +0000 (GMT) Received: from localhost ([::1]:51612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukc-0005S2-Jt for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujL-0003qR-PA for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujL-0007Ue-HP for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujL-00049A-FF for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 21/27] gnu: Add python-cchardet. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536691915744 (code B ref 42885); Wed, 10 Mar 2021 09:02:11 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:59 +0000 Received: from localhost ([127.0.0.1]:48695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj8-00045k-6l for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:58 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:20428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj6-000450-P6 for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:57 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4DwR0H2LtvzQjxK for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:51 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F0OVfZ7gajgPhRzw7EDnsceN/jSAF4w+PkIgOrhWn3k=; b=JumJRT/usHVnhWGy458F28xECZqwylzTrHrzuyKfdd58/dPF/MeXroYMTHX3JBrjtYGdS4 MRqU7dhyT9dRC+k+eJ1Q65YyfCD/9ZQOUuxWkC4z3TPRAWYK3fb5vATJIDr4tP/8klF1Wn 3u3N8+pvOF/KTyK0A7Za76CqOpLxelD+fT8OFJ8rAMOwqWkZklpQYn77Jik+Pe+bWvBFwD +LFxh1kussVdKePsmg0hMtIhOI/NyAMyAcGFroORabU46ugiYX2GxWnXjE9Lk+QE49sS5o GBSFgjBR7YPISQjX6ggNHOchvNyw7mMaUT381EyegecNRGZwQNSYC33sqYm5lA== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id nXmfvzGJVw7u for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:44 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:47 +1100 Message-Id: <20210310090053.21612-21-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -10.38 / 15.00 / 15.00 X-Rspamd-Queue-Id: 184491857 X-Rspamd-UID: a466f4 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/freedesktop.scm (python-cchardet): New variable. --- gnu/packages/freedesktop.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e5f9ea71b6..87f592844d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Anders Thuné ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1920,6 +1921,26 @@ encoding names are iconv-compatible.") ;; combination is GPL 2.0+. (license license:gpl2+))) +(define-public python-cchardet + (package + (name "python-cchardet") + (version "2.1.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cchardet" version)) + (sha256 + (base32 + "1bqfz85cd51sw0bvhvdq9ikccxi2ld7g5jpni4jkq1a5clrvca64")))) + (build-system python-build-system) + (inputs + `(("uchardet" ,uchardet))) + (home-page "https://github.com/PyYoshi/cChardet") + (synopsis "Fast universal character encoding detector") + (description + "cChardet is high speed universal character encoding detector.") + (license license:gpl2+))) + (define-public udiskie (package (name "udiskie") From patchwork Wed Mar 10 09:00:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27579 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 99CCA27BC52; Wed, 10 Mar 2021 09:02:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2844B27BC50 for ; Wed, 10 Mar 2021 09:02:58 +0000 (GMT) Received: from localhost ([::1]:49432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJuk5-0004Y2-BN for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:02:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujL-0003qO-Bb for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37177) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujL-0007US-3h for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujL-000493-0n for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 22/27] gnu: python-html5lib: Add python-chardet input. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536691815735 (code B ref 42885); Wed, 10 Mar 2021 09:02:10 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:01:58 +0000 Received: from localhost ([127.0.0.1]:48692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj7-00045i-Ts for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:58 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:20424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj4-00044d-Fn for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:54 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4DwR0F0PnfzQjbj for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:49 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iPmqTCFMj2P5M8omA6h2TOK5xnz1dIQdgGq3D1Jpmw0=; b=R8ag8JoiFOvf/PwEcY6LvOF/ilGqD9ASj71MkgM9vJZq5BLfiF9nkb52VizTnTTM2eqfrp qOkoLLm9bvg0J9FkD4yEFk8qPDqnrfTpKIwtIepHE2g1byEl+IXaWF05GG/QmrjYwpdlwo h4pOl9JVkz4PKmFGM76uez3cJ4f+tZyAuM4ua4y2jk7vyeBoJWXF6mG1OmgDPqtq9wZDez WNzAWsc/H48fsQO0XTGNyN0lzQWwtCXBXGGQUB0vft3+F6ljJAcvLY/BkpxAb65bIgx7sk RK7q0SjoeiFKEgLCbpCmJogljmbGJF3fB+CWo5KNTuQc4msZLn0rifwAHIhJmA== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id ue4PRRvSKIsP for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:46 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:48 +1100 Message-Id: <20210310090053.21612-22-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.89 / 15.00 / 15.00 X-Rspamd-Queue-Id: 26182185F X-Rspamd-UID: e8106e 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/python-web.scm: python-chardet to propragated-inputs. html5lib uses this as a fallback for encoding detection, and Calibre tests for its being there, so ad it. --- gnu/packages/python-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b0268e5a31..c527cfad90 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1041,7 +1041,8 @@ storage.") (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six) - ("python-webencodings" ,python-webencodings))) + ("python-webencodings" ,python-webencodings) + ("python-chardet" ,python-chardet))) (arguments `(#:test-target "check")) (home-page From patchwork Wed Mar 10 09:00:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27591 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 067D227BC51; Wed, 10 Mar 2021 09:03:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D0A8327BC50 for ; Wed, 10 Mar 2021 09:03:39 +0000 (GMT) Received: from localhost ([::1]:52426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukl-0005lL-1v for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJukA-00051H-LE for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37194) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJukA-00084P-Db for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJukA-0004BX-AP for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 23/27] gnu: calibre: Update to 5.13.0. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536693315980 (code B ref 42885); Wed, 10 Mar 2021 09:03:02 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:02:13 +0000 Received: from localhost ([127.0.0.1]:48704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJujC-00046e-A8 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:02:13 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:33366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj7-000458-Mu for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:59 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4DwR0J1v1pzQjx2 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:52 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yL94i1qaCE9EyEAB3jX1qpJxNdF3s8a0o1akeTj4exc=; b=JXe6z6hTTb06Rg/u+sdnpUW9W4vftx6Y3xWSQGFfRQC2gVM0zVggha1ZfzcCbUDsaeMEMA dJC7pfO2YBI/Ry3a53A+F3+3KCl1RzRA18YXWD8QNZFDz+JQgmym49zVmVBaUzID+F0Z/U ZAZz/E7WbKdTbp2WekGQE5YkqHjK4GmTFlA6yu+kKSQS5nT8y2gE8S8Uq3rYht4oZQWBkD uMk7hpg3IT5Ui73T61ggqDDn/sS0YC36Aq3wpp1huHnebMN4H3hyL0Aa9rdPvt1Ook/7je a2YdxrjLpO7KD+ira4igrhOzOV9WzYieE7WmZ9CU3SPDXqplY/yfS+wueZUVyw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id X1h3WiDA2YBt for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:48 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:49 +1100 Message-Id: <20210310090053.21612-23-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -14.19 / 15.00 / 15.00 X-Rspamd-Queue-Id: 439CD17CB X-Rspamd-UID: bacb47 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/ebook.scm (calibre): Update to 5.13.0. Switch all Python 2 inputs to their Python 3 equivalents. [native-inputs]: Add new dependency python-pyqt-builder. [inputs]: Remove js-mathmax. Calibre now uses a newer mathjax that we don't have in guix since it's needs a javascript bootstrap. Remove python-chardet. This is still used by python-html5lib but since I added the input directly to python-htmpl5lib, it is no longer needed here. Remove chmlib. python-chmlib bindings are used now. Remove python-sip Add new dependencies: - python-cchardet - python-speechd - python-zeroconf - python-py7zr - python-pychm - python-pycryptodome (Used by some Calibre extensions) [arguments]: get_sip_dir isn't used anymore, so now we specify the sip directory by editing the project.toml file. Also, for whatever reason, it doesn't build unless the WS_X11 tag is set. Don't try building mathjax support. Don't set SIP_BIN anymore since it isn't needed. * gnu/packages/patches/calibre-no-updates-dialog.patch * gnu/packages/patches/calibre-remove-test-sqlite.patch * gnu/packages/patches/calibre-remove-test-unrar.patch Remake these patches to work with the slightly different new source code. startars --- gnu/packages/ebook.scm | 101 +++++++++--------- .../patches/calibre-no-updates-dialog.patch | 22 ++-- .../patches/calibre-remove-test-sqlite.patch | 21 ++-- .../patches/calibre-remove-test-unrar.patch | 24 ++--- 4 files changed, 88 insertions(+), 80 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 763e3eba2b..124fcda4df 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin -;;; Copyright © 2017, 2019, 2020 Brendan Tildesley +;;; Copyright © 2017, 2019, 2020, 2021 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke @@ -58,10 +58,14 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-compression) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) + #:use-module (gnu packages speech) #:use-module (gnu packages sqlite) #:use-module (gnu packages time) #:use-module (gnu packages tls) @@ -111,7 +115,7 @@ (define-public calibre (package (name "calibre") - (version "4.18.0") + (version "5.13.0") (source (origin (method url-fetch) @@ -120,7 +124,7 @@ version ".tar.xz")) (sha256 (base32 - "0w9pcfvskjh4v00vjw3i6hzrafy863pgsmmqdx4lffip3p856brw")) + "08sljr5rg5f5i1s92g2li5f63mw458b8w5drgcxjm4k62rkl0c8q")) (modules '((guix build utils))) (snippet '(begin @@ -145,17 +149,16 @@ (native-inputs `(("pkg-config" ,pkg-config) ("qtbase" ,qtbase) ; for qmake - ("python2-flake8" ,python2-flake8) + ("python-flake8" ,python-flake8) + ("python-pyqt-builder" ,python-pyqt-builder) ("xdg-utils" ,xdg-utils))) (inputs - `(("chmlib" ,chmlib) - ("fontconfig" ,fontconfig) + `(("fontconfig" ,fontconfig) ("font-liberation" ,font-liberation) ("glib" ,glib) ("hunspell" ,hunspell) ("hyphen" ,hyphen) ("icu4c" ,icu4c) - ("js-mathjax" ,js-mathjax) ("libmtp" ,libmtp) ("libpng" ,libpng) ("libusb" ,libusb) @@ -163,39 +166,41 @@ ("optipng" ,optipng) ("podofo" ,podofo) ("poppler" ,poppler) - ("python" ,python-2) - ("python2-apsw" ,python2-apsw) - ("python2-beautifulsoup4" ,python2-beautifulsoup4) - ("python2-chardet" ,python2-chardet) - ("python2-cssselect" ,python2-cssselect) - ("python2-css-parser" ,python2-css-parser) - ("python2-dateutil" ,python2-dateutil) - ("python2-dbus" ,python2-dbus) - ("python2-dnspython" ,python2-dnspython-1.16) - ("python2-dukpy" ,python2-dukpy) - ("python2-feedparser" ,python2-feedparser) - ("python2-html2text" ,python2-html2text) - ("python2-html5-parser" ,python2-html5-parser) - ("python2-html5lib" ,python2-html5lib) - ("python2-lxml" ,python2-lxml) - ("python2-markdown" ,python2-markdown) - ("python2-mechanize" ,python2-mechanize) - ;; python2-msgpack is needed for the network content server to work. - ("python2-msgpack" ,python2-msgpack) - ("python2-netifaces" ,python2-netifaces) - ("python2-odfpy" ,python2-odfpy) - ("python2-pillow" ,python2-pillow) - ("python2-psutil" ,python2-psutil) - ("python2-pygments" ,python2-pygments) - ("python2-pyqtwebengine" ,python2-pyqtwebengine) - ("python2-pyqt" ,python2-pyqt) - ("python2-sip" ,python2-sip) - ("python2-regex" ,python2-regex) + ("python-apsw" ,python-apsw) + ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-cchardet" ,python-cchardet) + ("python-css-parser" ,python-css-parser) + ("python-cssselect" ,python-cssselect) + ("python-dateutil" ,python-dateutil) + ("python-dbus" ,python-dbus) + ("python-dnspython" ,python-dnspython-1.16) + ("python-dukpy" ,python-dukpy) + ("python-feedparser" ,python-feedparser) + ("python-html2text" ,python-html2text) + ("python-html5-parser" ,python-html5-parser) + ("python-html5lib" ,python-html5lib) + ("python-lxml" ,python-lxml) + ("python-markdown" ,python-markdown) + ("python-mechanize" ,python-mechanize) + ;; python-msgpack is needed for the network content server to work. + ("python-msgpack" ,python-msgpack) + ("python-netifaces" ,python-netifaces) + ("python-odfpy" ,python-odfpy) + ("python-pillow" ,python-pillow) + ("python-psutil" ,python-psutil) + ("python-py7zr" ,python-py7zr) + ("python-pychm" ,python-pychm) + ("python-pycryptodome" ,python-pycryptodome) + ("python-pygments" ,python-pygments) + ("python-pyqt" ,python-pyqt) + ("python-pyqtwebengine" ,python-pyqtwebengine) + ("python-regex" ,python-regex) + ("python-speechd" ,speech-dispatcher) + ("python-zeroconf" ,python-zeroconf) ("qtwebengine" ,qtwebengine) ("sqlite" ,sqlite))) (arguments - `(#:python ,python-2 - ;; Calibre is using setuptools by itself, but the setup.py is not + `(;; Calibre is using setuptools by itself, but the setup.py is not ;; compatible with the shim wrapper (taken from pip) we are using. #:use-setuptools? #f #:phases @@ -227,13 +232,16 @@ (add-before 'build 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((podofo (assoc-ref inputs "podofo")) - (pyqt (assoc-ref inputs "python2-pyqt")) - (python-sip (assoc-ref inputs "python2-sip")) + (pyqt (assoc-ref inputs "python-pyqt")) + (python-sip (assoc-ref inputs "python-sip")) (out (assoc-ref outputs "out"))) - (substitute* "setup/build_environment.py" - (("= get_sip_dir\\(\\)") - (string-append "= '" pyqt "/share/sip'"))) - + (substitute* "setup/build.py" + (("\\[tool.sip.bindings.pictureflow\\]") + "[tool.sip.bindings.pictureflow] +tags = [\"WS_X11\"]") + (("\\[tool.sip.project\\]") + (string-append "[tool.sip.project] +sip-include-dirs = [\"" pyqt "/share/sip" "\"]"))) (substitute* "src/calibre/ebooks/pdf/pdftohtml.py" (("PDFTOHTML = 'pdftohtml'") (string-append "PDFTOHTML = \"" (assoc-ref inputs "poppler") @@ -257,7 +265,6 @@ "/share/fonts") "/tmp/.fonts") - (setenv "SIP_BIN" (string-append python-sip "/bin/sip")) (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) ;; This informs the tests we are a continuous integration @@ -270,11 +277,7 @@ #t))) (add-after 'build 'build-extra (lambda* (#:key inputs #:allow-other-keys) - (invoke "python2" "setup.py" "mathjax""--system-mathjax" - "--path-to-mathjax" (string-append - (assoc-ref inputs "js-mathjax") - "/share/javascript/mathjax")) - (invoke "python2" "setup.py" "rapydscript") + (invoke "python" "setup.py" "rapydscript") #t)) (add-after 'install 'install-man-pages (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/patches/calibre-no-updates-dialog.patch b/gnu/packages/patches/calibre-no-updates-dialog.patch index 1d8d79660e..66ac913cb5 100644 --- a/gnu/packages/patches/calibre-no-updates-dialog.patch +++ b/gnu/packages/patches/calibre-no-updates-dialog.patch @@ -1,11 +1,17 @@ -Taken from debian. +From 19e8d7701c302b0eca4c638705a6db625352caa3 Mon Sep 17 00:00:00 2001 +From: Brendan Tildesley +Date: Thu, 25 Feb 2021 12:17:30 +1100 +Subject: [PATCH] Don't check for updates. -# Description: Disable update check by default. -Index: calibre/src/calibre/gui2/main.py -=================================================================== ---- calibre.orig/src/calibre/gui2/main.py 2014-02-02 10:41:28.470954623 +0100 -+++ calibre/src/calibre/gui2/main.py 2014-02-02 10:41:56.546954247 +0100 -@@ -37,8 +37,8 @@ +--- + src/calibre/gui2/main.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py +index 776f8bebfb..4302716d7e 100644 +--- a/src/calibre/gui2/main.py ++++ b/src/calibre/gui2/main.py +@@ -59,8 +59,8 @@ def option_parser(): help=_('Start minimized to system tray.')) parser.add_option('-v', '--verbose', default=0, action='count', help=_('Ignored, do not use. Present only for legacy reasons')) @@ -16,3 +22,5 @@ Index: calibre/src/calibre/gui2/main.py parser.add_option('--ignore-plugins', default=False, action='store_true', help=_('Ignore custom plugins, useful if you installed a plugin' ' that is preventing calibre from starting')) +-- +2.30.1 diff --git a/gnu/packages/patches/calibre-remove-test-sqlite.patch b/gnu/packages/patches/calibre-remove-test-sqlite.patch index 7bdd90874d..fc2b237ef2 100644 --- a/gnu/packages/patches/calibre-remove-test-sqlite.patch +++ b/gnu/packages/patches/calibre-remove-test-sqlite.patch @@ -1,20 +1,20 @@ -From a92e26359bd07743ab105819ed0b619e27e14017 Mon Sep 17 00:00:00 2001 +From d8225e83c3b73f0e0da73874910f50ca652f48cf Mon Sep 17 00:00:00 2001 From: Brendan Tildesley -Date: Sat, 27 Apr 2019 03:30:53 +1000 -Subject: [PATCH] Disable test_sqlite. +Date: Thu, 25 Feb 2021 00:48:00 +1100 +Subject: [PATCH] Remove test_sqlite --- src/calibre/test_build.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py -index 07bdffd3e5..740588c95b 100644 +index 0ab7aa0646..87fdfabd9a 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py -@@ -162,12 +162,6 @@ class BuildTest(unittest.TestCase): - au(x, 'strftime') - self.assertEqual(unicode_type(time.strftime(fmt.replace('%e', '%#d'), t)), x) - +@@ -273,12 +273,6 @@ def read_changes(): + m.close() + self.assertEqual(winutil.parse_cmdline('"c:\\test exe.exe" "some arg" 2'), ('c:\\test exe.exe', 'some arg', '2')) + - def test_sqlite(self): - import sqlite3 - conn = sqlite3.connect(':memory:') @@ -24,6 +24,5 @@ index 07bdffd3e5..740588c95b 100644 def test_apsw(self): import apsw conn = apsw.Connection(':memory:') --- -2.21.0 - +-- +2.30.1 diff --git a/gnu/packages/patches/calibre-remove-test-unrar.patch b/gnu/packages/patches/calibre-remove-test-unrar.patch index 4e5572d1a6..961cc3eba7 100644 --- a/gnu/packages/patches/calibre-remove-test-unrar.patch +++ b/gnu/packages/patches/calibre-remove-test-unrar.patch @@ -1,28 +1,26 @@ -Unrar contains security vulnerabilities and has thus been removed from Guix. -From a16f97b02bd8afd0ec05c471e156f631f2cc6eec Mon Sep 17 00:00:00 2001 +From 9edf67191cc3655480b6fd418247709ade930b1a Mon Sep 17 00:00:00 2001 From: Brendan Tildesley -Date: Tue, 26 Mar 2019 22:17:03 +1100 -Subject: [PATCH] Remove test_unrar. +Date: Thu, 25 Feb 2021 00:33:10 +1100 +Subject: [PATCH] Remove test_unrar --- src/calibre/test_build.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py -index d67afd20a6..709132ef17 100644 +index b37fb1bcfb..0ab7aa0646 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py -@@ -220,10 +220,6 @@ class BuildTest(unittest.TestCase): +@@ -369,10 +369,6 @@ def test_file_dialog_helper(self): from calibre.gui2.win_file_dialogs import test test() - + - def test_unrar(self): - from calibre.utils.unrar import test_basic - test_basic() - - @unittest.skipUnless(iswindows, 'WPD is windows only') - def test_wpd(self): - wpd = plugins['wpd'][0] --- -2.21.0 - + def test_7z(self): + from calibre.utils.seven_zip import test_basic + test_basic() +-- +2.30.1 From patchwork Wed Mar 10 09:00:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27589 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 A057F27BC50; Wed, 10 Mar 2021 09:03:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4800D27BC51 for ; Wed, 10 Mar 2021 09:03:39 +0000 (GMT) Received: from localhost ([::1]:52412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukk-0005kv-Cw for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJujM-0003rR-H7 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37179) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJujL-0007VI-VV for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJujL-00049I-TN for guix-patches@gnu.org; Wed, 10 Mar 2021 04:02:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 24/27] gnu: calibre: Patch some paths. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:02:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536692215791 (code B ref 42885); Wed, 10 Mar 2021 09:02:11 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:02:02 +0000 Received: from localhost ([127.0.0.1]:48700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJujB-00046V-Rf for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:20430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJuj8-00045A-AG for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:01:59 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4DwR0J6FnJzQjxL for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:52 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jNjZlBur9eLZQT8QQSaEAuoMBCmbxturj76H7MOqUdY=; b=on7UibHth/vDrtpDRDGTtwDlotSGEah9NQwba+T662myTiRzCcbZM2DFTBz/nLUQQCkMpy K0vKBaK0p81eZ4iMiOqhSK+QACUZeGwSEVH5wflYZbd+tDQQDHPAIqrbPxzF7xc658Y1mO oDwvG+bEXaUhZIt1us1OHG7DGEV5GpsA+8ZrOUXmZKEK/9anNx/r2yg3kXrxSPfkLb9PT8 JtOKlR0IqVDsw7X3cXCEOM7yVvlUa3bXjXg/PoVrT3Q7tX2SGwtUo6SRvf9a6D89FHL+d4 /PxBXXu2mCQ95uu11E+UXMkZ1drzJxZmgQLvZ5whrtarV0BRd/NXSnxFX7DLfg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id hTPbYAbay_RY for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:49 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:50 +1100 Message-Id: <20210310090053.21612-24-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.89 / 15.00 / 15.00 X-Rspamd-Queue-Id: E4B071868 X-Rspamd-UID: ca1dcb 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/ebook.scm (calibre): [inputs]: Add libjpeg and libjxz. [arguments]: substitute Calibre's weird get_exe_path procedure that looks in poppler's output directory for binaries with direct paths to jpegtran, cjpeg, optipng, and JxrDecApp. --- gnu/packages/ebook.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 124fcda4df..be367a5245 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -161,6 +161,8 @@ ("icu4c" ,icu4c) ("libmtp" ,libmtp) ("libpng" ,libpng) + ("libjpeg" ,libjpeg-turbo) + ("libjxr" ,libjxr) ("libusb" ,libusb) ("openssl" ,openssl) ("optipng" ,optipng) @@ -246,7 +248,12 @@ sip-include-dirs = [\"" pyqt "/share/sip" "\"]"))) (("PDFTOHTML = 'pdftohtml'") (string-append "PDFTOHTML = \"" (assoc-ref inputs "poppler") "/bin/pdftohtml\""))) - + ;; get_exe_path looks in poppler's output for these binaries. + (substitute* "src/calibre/utils/img.py" + (("get_exe_path..jpegtran..") (string-append "'" (which "jpegtran") "'")) + (("get_exe_path..cjpeg..") (string-append "'" (which "cjpeg") "'")) + (("get_exe_path..optipng..") (string-append "'" (which "optipng") "'")) + (("get_exe_path..JxrDecApp..") (string-append "'" (which "JxrDecApp") "'"))) ;; Calibre thinks we are installing desktop files into a home ;; directory, but here we butcher the script in to installing ;; to calibres /share directory. From patchwork Wed Mar 10 09:00:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27592 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 C009527BC51; Wed, 10 Mar 2021 09:03:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 83CDF27BC50 for ; Wed, 10 Mar 2021 09:03:51 +0000 (GMT) Received: from localhost ([::1]:53104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJukw-00061m-Nk for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJukB-00052F-2A for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJukA-00084f-QJ for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJukA-0004Be-Mt for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 25/27] gnu: calibre: Add qtsvg as input. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536693315987 (code B ref 42885); Wed, 10 Mar 2021 09:03:02 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:02:13 +0000 Received: from localhost ([127.0.0.1]:48729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJujN-00049h-EF for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:02:13 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:33370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJujA-00045L-24 for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:02:00 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4DwR0L4R2nzQjx3 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:54 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Yl78fo0vVjw8VMnM4pkH37n7jDptDTKMlka0QbC2HfM=; b=zvoWcl8XEOpRkMu8uTVtLjJ5cxSGTsyPpy5zr40TR2Lja7DXn40+50BzwXbqiSLAqfietL o446I/gw0EGqiayaJZTNFVKqV8Ja7NQspA77WbS4Ce7enhHLOpx0BiOTbhM8QN4+qAVjQP NMfHKZoNRleOzMpY+Jxyt2Cp+1IZdcwD3bvifja7Q4dGqtOYQx1ZV9qS/gMu/t2kkFV0KP yttuJqTwW8BgPlGYkBIisnN6Wu5fJy73C2q8Tr7fMABqKRVWS47HZDlnp1VYhFvW39+zvJ RHqtWfQwNJ14Trn0JY+PRZJ45VveQjfmsk4JxdtGoDTJflkdPWebBganXF1FGA== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id 9ORGP1KeoS-7 for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:51 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:51 +1100 Message-Id: <20210310090053.21612-25-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.89 / 15.00 / 15.00 X-Rspamd-Queue-Id: A6FAF1879 X-Rspamd-UID: f01001 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/ebook.scm (calibre):[inputs]: Add qtsvg as an input. This fixes part of the broken qt test, but not all. It still fails printing to pdf. --- gnu/packages/ebook.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index be367a5245..25a31c9a65 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -199,6 +199,7 @@ ("python-regex" ,python-regex) ("python-speechd" ,speech-dispatcher) ("python-zeroconf" ,python-zeroconf) + ("qtsvg" ,qtsvg) ("qtwebengine" ,qtwebengine) ("sqlite" ,sqlite))) (arguments @@ -277,9 +278,8 @@ sip-include-dirs = [\"" pyqt "/share/sip" "\"]"))) ;; This informs the tests we are a continuous integration ;; environment and thus have no networking. (setenv "CI" "true") - ;; The Qt test complains about being unable to load all image plugins, and I - ;; notice the available plugins list it shows lacks 'svg'. Adding qtsvg doesn't - ;; fix it, so I'm not sure how to fix it. TODO: Fix test and remove this. + ;; The Qt test fails at printing to pdf: + ;; AssertionError: b'Skia/PDF' not found in b'' : Print to PDF failed (setenv "SKIP_QT_BUILD_TEST" "true") #t))) (add-after 'build 'build-extra From patchwork Wed Mar 10 09:00:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27594 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 4BC2F27BC51; Wed, 10 Mar 2021 09:04:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0F94927BC50 for ; Wed, 10 Mar 2021 09:04:03 +0000 (GMT) Received: from localhost ([::1]:53788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJul8-0006IL-8q for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:04:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJukB-000536-GL for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37196) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJukB-00085i-6K for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJukB-0004Bl-3G for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 26/27] gnu: Remove python2-pyqtwebengine. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536693415995 (code B ref 42885); Wed, 10 Mar 2021 09:03:03 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:02:14 +0000 Received: from localhost ([127.0.0.1]:48731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJujN-00049o-Sx for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:02:14 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:63674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJujB-00045Z-S0 for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:02:02 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4DwR0N2yQkzQjll for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:56 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QyB9TwsnYmIZazb3u3b7curavOV3EpF2ypt4TrNjYFg=; b=Y6n2jUuXeb6Q0DRzcYGW1yWtzKmkpcLXybKZ831AjA96OBikkDV8eygDMjZTMxSot0EYTI 92vBSJciYuBXOKNjULCI8sxr+mfBKF5Hr1MGE9jFbcMuUDHjEtMfsW+/iU6PNFjiIvYhfq 3BW58b/ruVtdJHO0gZ5V6ouZuLIxUc8B1JtxjbrZV1GPgo5VvdZSohlZ1tVpCeSM5mm+5n Nu6+AtOmOmuIe9JwzxlwMQLkdmAbWXsImuIX4qFoi+IpMoKrL013bQrkGRRxR8kHY4KQYz HB250p2tVbvtn5VAlMzbBQihWuqCpCcCkpjTghCPjDPVDhBS8ojKspb5JaRQsw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id fh5hCI4tqddx for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:53 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:52 +1100 Message-Id: <20210310090053.21612-26-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: *** X-Rspamd-Score: 3.48 / 15.00 / 15.00 X-Rspamd-Queue-Id: 765421860 X-Rspamd-UID: 69f8c0 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/qt.scm (python2-pyqtwebengine): Delete unused variable. --- gnu/packages/qt.scm | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b615a74755..ad779940e9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2289,25 +2289,6 @@ itself.") ("python2-enum34" ,python2-enum34) ,@(alist-delete "python" (package-inputs python-pyqt)))))) -(define-public python2-pyqtwebengine - (package/inherit - python-pyqtwebengine - (name "python2-pyqtwebengine") - (native-inputs - `(("python" ,python-2) - ("python-sip" ,python2-sip) - ;; qtbase is required for qmake - ("qtbase" ,qtbase))) - (inputs - `(("python" ,python-2) - ("python-sip" ,python2-sip) - ("python-pyqt" ,python2-pyqt) - ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg) - ("qtdeclarative" ,qtdeclarative) - ("qtwebchannel" ,qtwebchannel) - ("qtwebengine" ,qtwebengine))))) - (define-public python2-pyqt-4 (package (inherit python-pyqt) (name "python2-pyqt") From patchwork Wed Mar 10 09:00:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 27593 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 9000827BC51; Wed, 10 Mar 2021 09:03:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6179B27BC50 for ; Wed, 10 Mar 2021 09:03:53 +0000 (GMT) Received: from localhost ([::1]:53264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJuky-00065a-GS for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 04:03:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJukB-00053x-Rq for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37197) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJukB-00086G-K2 for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJukB-0004Bt-Gr for guix-patches@gnu.org; Wed, 10 Mar 2021 04:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#42885] [PATCH 27/27] gnu: Remove python2-pyqt. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 09:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42885@debbugs.gnu.org Received: via spool by 42885-submit@debbugs.gnu.org id=B42885.161536693716020 (code B ref 42885); Wed, 10 Mar 2021 09:03:03 +0000 Received: (at 42885) by debbugs.gnu.org; 10 Mar 2021 09:02:17 +0000 Received: from localhost ([127.0.0.1]:48736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJujR-0004AJ-Cx for submit@debbugs.gnu.org; Wed, 10 Mar 2021 04:02:17 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:16000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJujD-00045q-JJ for 42885@debbugs.gnu.org; Wed, 10 Mar 2021 04:02:16 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4DwR0Q12hdzQjhF for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:58 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1615366916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S3P9Zzn+Nlia1pW3G8lVBh3WW9ueZP06M2S6mLiAIbc=; b=h0sIiE+CPnPhsux/6sjMDP2zH4IjBM+4Q1eG4SEO6yPZVsXAiexKnZ73gcy3B/WpLMwqqB jtVgP21bUvDKKFFzXP01pVVSV0NMXiuU5GvlB83gcUcHi/sH6vjpMPOy+ur2WtutPUHhYz 6GMd1951KCnKMfOzTzfyVC85Z5hpHvPnvuzyUa9zW0guJ0w6Q8gjGepiKKI72eraPngBA3 LzdGDH0h2dU4SBk/tqip3ajwkkHGK9arKud53u2+4tM17IHGsEg68SuoxNu8jTS8E/TCs2 K8lG0ThYX1OVdQ4QV8M8TAI/ld/s2kVwdV3RSB5Eu+iJKWa+560fFk0yfbkY/w== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id QzbgBnVt2PCx for <42885@debbugs.gnu.org>; Wed, 10 Mar 2021 10:01:55 +0100 (CET) From: Brendan Tildesley Date: Wed, 10 Mar 2021 20:00:53 +1100 Message-Id: <20210310090053.21612-27-mail@brendan.scot> In-Reply-To: <20210310090053.21612-1-mail@brendan.scot> References: <20210310090053.21612-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: *** X-Rspamd-Score: 3.48 / 15.00 / 15.00 X-Rspamd-Queue-Id: 26AC11868 X-Rspamd-UID: 43d290 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/qt.scm (python2-pyqt): Delete unused variable. --- gnu/packages/qt.scm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ad779940e9..872cb40305 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2275,20 +2275,6 @@ itself.") (inputs (alist-delete "qtwebkit" (package-inputs python-pyqt))))) -(define-public python2-pyqt - (package (inherit python-pyqt) - (name "python2-pyqt") - (propagated-inputs - `(("python-enum34" ,python2-enum34) - ("python-sip" ,python2-sip))) - (native-inputs - `(("python-sip" ,python2-sip) - ("qtbase" ,qtbase))) - (inputs - `(("python" ,python-2) - ("python2-enum34" ,python2-enum34) - ,@(alist-delete "python" (package-inputs python-pyqt)))))) - (define-public python2-pyqt-4 (package (inherit python-pyqt) (name "python2-pyqt")