From patchwork Mon Feb 7 02:05:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37043 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 3641427BBEA; Mon, 7 Feb 2022 02:08:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0BBF927BBE9 for ; Mon, 7 Feb 2022 02:08:56 +0000 (GMT) Received: from localhost ([::1]:45986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGtSZ-0002f2-8J for patchwork@mira.cbaines.net; Sun, 06 Feb 2022 21:08:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGtQk-0001U4-7x for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGtQj-000806-Ut for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGtQj-0008Jm-QX for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53836] [PATCH 1/6] gnu: python-regex: Update to 2022.1.18. References: <474301531.259712.1644199444941@office.mailbox.org> In-Reply-To: <474301531.259712.1644199444941@office.mailbox.org> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 02:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53836@debbugs.gnu.org Received: via spool by 53836-submit@debbugs.gnu.org id=B53836.164419956231840 (code B ref 53836); Mon, 07 Feb 2022 02:07:01 +0000 Received: (at 53836) by debbugs.gnu.org; 7 Feb 2022 02:06:02 +0000 Received: from localhost ([127.0.0.1]:40493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPi-0008H9-JD for submit@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:02 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPh-0008Gu-2U for 53836@debbugs.gnu.org; Sun, 06 Feb 2022 21:05:57 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (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 4JsTy665xpz9sT1 for <53836@debbugs.gnu.org>; Mon, 7 Feb 2022 03:05:50 +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=1644199548; 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; bh=Pg/UgMSEp+ZgDyQxa5bwRilczDfYvtLoD+9ltE5xzbA=; b=FHBIAW8VXUG8fF+viza1hdxMXY7T2y41TANsdcFAslcJbPaS70yBwPjTTs2a8E5AWNe9S1 +zJI4Cm1gFaJJ47UqA2xV8HHgE7W2lCyGsLQmGqu8MvopquisQsw+1RHfbAyjAaxU797N/ Tif5v3Xc746GEqsuCfrKNCLtCHPAPZhtH7TckAYX7m+lgYjwjk+iIZCa4HkGpxTsPI8Eqe 37W8QGM8gnc06mg1DiMHviCWyCJt45LHYc80QOFCtuoAu/Ahd45pHy3jmdLRwHfJdYdVTs 50oBup227ujNXW6ijoqdV0ZZ+MWVndvMqcv0ZpKkIjLyIZXHwUqSCRPxKRDXGg== From: Brendan Tildesley Date: Mon, 7 Feb 2022 13:05:37 +1100 Message-Id: <20220207020542.29004-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-regex): Update to 2022.1.18. --- 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 7c1b5e8ed3..5a33dc05bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20074,13 +20074,13 @@ (define-public python2-smmap (define-public python-regex (package (name "python-regex") - (version "2020.6.8") + (version "2022.1.18") (source (origin (method url-fetch) (uri (pypi-uri "regex" version)) (sha256 (base32 - "1b3k0zi1pd99q5mk7ri7vcx2y1mq5inm9hk8dryqyhrpkmh4xdp9")))) + "05ir92d0cmv8wkafn3r05j5q47l6shg7cpdblp2a8m407b02vwwp")))) (build-system python-build-system) (arguments '(#:phases From patchwork Mon Feb 7 02:05:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37041 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 8620427BBE9; Mon, 7 Feb 2022 02:08:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 269DD27BBEA for ; Mon, 7 Feb 2022 02:08:19 +0000 (GMT) Received: from localhost ([::1]:44450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGtRy-0001Y0-8f for patchwork@mira.cbaines.net; Sun, 06 Feb 2022 21:08:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGtQs-0001VU-2G for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46614) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGtQl-00080K-4J for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGtQl-0008K8-0N for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53836] [PATCH 2/6] gnu: python-html5-parser: Update to 0.4.10. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 02:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53836@debbugs.gnu.org Received: via spool by 53836-submit@debbugs.gnu.org id=B53836.164419957031890 (code B ref 53836); Mon, 07 Feb 2022 02:07:02 +0000 Received: (at 53836) by debbugs.gnu.org; 7 Feb 2022 02:06:10 +0000 Received: from localhost ([127.0.0.1]:40503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPt-0008IC-SO for submit@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:10 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:39436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPj-0008Gx-9c for 53836@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:05 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4: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 4JsTy94WQ8z9sQm for <53836@debbugs.gnu.org>; Mon, 7 Feb 2022 03:05:53 +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=1644199551; 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=ppovr/WVLGhss01A0T0cqSCuLrCjHWI6M5RLTwqHxh0=; b=R/XGIdxY8SQslzX8LZ6c+ijVoJhLBwYBu3cX7TgsBMMlABHhGTRCaPVOYMLwMijK8wyL87 LDk4e8m3tEhOUDkzj8dmR7OKiJSfOZ//xt1OLTigRRG/7br05yuMJgcggoiH3bcC7wcSb5 wM+f+Phv5Hm69vtMz9M2V1myKYUPmQNts8GqpEbqqkd6i+SDvnji3Fh9G7UJpBwabf+nNp Gsok4S/mB0tUR+lt9KfTNiHsVQoPhCdmt+sAXF/xWLHDT/xJZcprwmwMdeqrJErArhfr9H 396NQfVXm4HPuQrjjjWhYisi29m+hVaeDGLA3YPBsoWA5hOOkIgBZiSDhVAiQg== From: Brendan Tildesley Date: Mon, 7 Feb 2022 13:05:38 +1100 Message-Id: <20220207020542.29004-2-mail@brendan.scot> In-Reply-To: <20220207020542.29004-1-mail@brendan.scot> References: <20220207020542.29004-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-web.scm (python-html5-parser): Update to 0.4.10. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 408d7f6571..3bcacdb19f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1279,13 +1279,13 @@ (define-public python2-html5lib-0.9 (define-public python-html5-parser (package (name "python-html5-parser") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (pypi-uri "html5-parser" version)) (sha256 (base32 - "13yl3vnf3sxl05m0nhpngnrz3g1jvyahd33lys3m3hfb91l8zzi5")))) + "195wgxls3df7djry9cz3p2k9644l6bfd66fczbaw55fsq0c48agr")))) (build-system python-build-system) (native-inputs (list pkg-config)) From patchwork Mon Feb 7 02:05:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37045 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 2D33927BBEA; Mon, 7 Feb 2022 02:09:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E892327BBE9 for ; Mon, 7 Feb 2022 02:09:20 +0000 (GMT) Received: from localhost ([::1]:46426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGtSy-0002y0-5N for patchwork@mira.cbaines.net; Sun, 06 Feb 2022 21:09:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGtQr-0001VL-4X for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGtQk-00080H-Ne for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGtQk-0008K0-JV for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53836] [PATCH 3/6] gnu: python-apsw: Enable extension loading. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 02:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53836@debbugs.gnu.org Received: via spool by 53836-submit@debbugs.gnu.org id=B53836.164419956831883 (code B ref 53836); Mon, 07 Feb 2022 02:07:02 +0000 Received: (at 53836) by debbugs.gnu.org; 7 Feb 2022 02:06:08 +0000 Received: from localhost ([127.0.0.1]:40501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPs-0008IA-Ll for submit@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:08 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:36940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPp-0008HB-F6 for 53836@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:05 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4: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 4JsTyG6Zpxz9scn for <53836@debbugs.gnu.org>; Mon, 7 Feb 2022 03:05: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=1644199556; 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=29yuQmUZC8OhYS06hmJg4/WSLX2eVZ2ma1249V0WOnU=; b=LB0k9rKvOI7Cdhg6ICRTMXS23BoG67OzVHq44RHLQEFut2tGKkp7JUe6EXh8duhUDHJuHq OjRUqEWr8NJIvUDn3L1fPUnXYJiUfDpVXHy1qNvb4AJmnrIqUiW0ovcQ7hEhJSfqbvlnbm 9HGz1REolchpZoprQYZ3gKy3qZE/6M3Th0YM+S68LRA7nxsKVqa4W+Kcr9PQpe569v6Scf TI7LoEXqtoVvljzeoUEUTvdg9sZdHais5BW9rjfB3RNNMCq01ca4wExqe+WIRyuiLS5A5A OQtJgdH+AehT6/WAN5rQlDmlZgReYholyTCLG/Vcra+gjCAsLexpM4uqk5G1jA== From: Brendan Tildesley Date: Mon, 7 Feb 2022 13:05:39 +1100 Message-Id: <20220207020542.29004-3-mail@brendan.scot> In-Reply-To: <20220207020542.29004-1-mail@brendan.scot> References: <20220207020542.29004-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/databases.scm (python-apsw): Enable extension loading. It is required by calibre. --- gnu/packages/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f6c1046a51..c71f208f2b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3554,7 +3554,8 @@ (define-public python-apsw (modify-phases %standard-phases (replace 'build (lambda _ - (invoke "python" "setup.py" "build" "--enable-all-extensions") + (invoke "python" "setup.py" "build" "--enable-all-extensions" + "--enable=load_extension") #t)) (add-after 'build 'build-test-helper (lambda _ From patchwork Mon Feb 7 02:05:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37044 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 21F6F27BBEA; Mon, 7 Feb 2022 02:09:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E1CF627BBE9 for ; Mon, 7 Feb 2022 02:09:05 +0000 (GMT) Received: from localhost ([::1]:46202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGtSj-0002oL-46 for patchwork@mira.cbaines.net; Sun, 06 Feb 2022 21:09:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGtQk-0001Um-L3 for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46612) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGtQk-00080C-B2 for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGtQk-0008Jt-6p for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53836] [PATCH 4/6] gnu: python-css-parser: Update to 1.0.7. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 02:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53836@debbugs.gnu.org Received: via spool by 53836-submit@debbugs.gnu.org id=B53836.164419956631868 (code B ref 53836); Mon, 07 Feb 2022 02:07:02 +0000 Received: (at 53836) by debbugs.gnu.org; 7 Feb 2022 02:06:06 +0000 Received: from localhost ([127.0.0.1]:40498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPq-0008Hw-Cs for submit@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:06 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:39442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPn-0008H8-O2 for 53836@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:04 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4: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 4JsTyG0Qgrz9sSv for <53836@debbugs.gnu.org>; Mon, 7 Feb 2022 03:05: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=1644199555; 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=HEtZbl+V2JDQ4mavBwRlNRMhNDKHO/lC3WzxNL6EF2g=; b=uPEOjoEByljhRlDsLZEWH39fHApjILan/2w2F5xoqG6NaPCSqEMGW89thKFM0YRt8TDwfN A2kggfUb+FR3BBHzkiQIdiBZIvBXbGbi0ipUrQazpzynHPi/uozid0yMq158b/WEM/iau6 1BuWKcZzZuL1wF4C89Fk+Cs75ViLm3TYBVaJwyP4KCYRDzCVi8eh67KN2GMlrfw4uJXDMe tzxdVVXfJA15BaPiYtGyIBpWH1jIOzQnMJil6XexKXw6toS+eNh25ViC9dqbNP8XnCdmp5 WHoTEhT6b8MtcvumBb0lgmb/M/brkZXg+HV6wmWiJC50E9u99VpTk4UKxYtwsg== From: Brendan Tildesley Date: Mon, 7 Feb 2022 13:05:40 +1100 Message-Id: <20220207020542.29004-4-mail@brendan.scot> In-Reply-To: <20220207020542.29004-1-mail@brendan.scot> References: <20220207020542.29004-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-web.scm (python-css-parser): Update to 1.0.7. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3bcacdb19f..81fb931189 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1472,13 +1472,13 @@ (define-public python-css-parser (package (inherit python-cssutils) (name "python-css-parser") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "css-parser" version ".tar.gz")) (sha256 - (base32 "0bmg4kiiir6pj9x3sd12x4dz2c1xpp2bn5nn60fxnbk2lnl4im2f")))) + (base32 "1ldv9s3an4pgk7b5x6z07rw9b5fdrasdldnf22829pb26b39dq15")))) (home-page "https://github.com/ebook-utils/css-parser") (synopsis "Fork of cssutils modified for parsing ebooks") (description From patchwork Mon Feb 7 02:05:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37040 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 461A327BBEC; Mon, 7 Feb 2022 02:08:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 85A8727BBE9 for ; Mon, 7 Feb 2022 02:08:18 +0000 (GMT) Received: from localhost ([::1]:44442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGtRw-0001Xw-OH for patchwork@mira.cbaines.net; Sun, 06 Feb 2022 21:08:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGtQs-0001VT-2R for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGtQl-00080P-T2 for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGtQl-0008KM-Of for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53836] [PATCH 5/6] gnu: calibre: Update to 5.36.0. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 02:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53836@debbugs.gnu.org Received: via spool by 53836-submit@debbugs.gnu.org id=B53836.164419957931922 (code B ref 53836); Mon, 07 Feb 2022 02:07:03 +0000 Received: (at 53836) by debbugs.gnu.org; 7 Feb 2022 02:06:19 +0000 Received: from localhost ([127.0.0.1]:40508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPy-0008Ij-JJ for submit@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:19 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPt-0008He-Av for 53836@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:13 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4: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 4JsTyM4wgrz9sT1 for <53836@debbugs.gnu.org>; Mon, 7 Feb 2022 03:06:03 +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=1644199561; 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=CzUtRkvf6fr82OLCHCXmH+IerPDqh61/Pa12Sy/ZqYY=; b=hgN7Ou24tiTL7BowvoT9qEydFmkkZpcGhgU/CzSRtonl0G5M0hXtX339YHxXAwJj0HjB4n AfpKmSw5aZrh0Qazi+Uak9R49b+jUw3vvYVDOq2cJvf0mfmCxPxqgIcJbscnEhtNoUHs/2 Xs6DEM68NyR5U6QmdxwS0b5OTDySSdRCEXi/PY/S7wwaog6BoqSMtKX/xANCxZYTI5iOgw 9x3LRFYN9zNQIW8j92/6xFiKR+HNFeLuyMXEnxJAQ9c7JpcO5/5rSAcXdFJnnsyGgIfcaS nI1s/gZvs8tgdJ5dqcUFBezNgSGiYVVv800ukltbjPac3ykm883wV9D7ccTOgg== From: Brendan Tildesley Date: Mon, 7 Feb 2022 13:05:41 +1100 Message-Id: <20220207020542.29004-5-mail@brendan.scot> In-Reply-To: <20220207020542.29004-1-mail@brendan.scot> References: <20220207020542.29004-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ebook.scm (calibre): Update to 5.36.0. Remove no longer needed zeroconf patch. [inputs]: Use new inputs style. Remove python-dbus, python-dukpy, python-pycryptodome. Add python-jeepney, libstemmer. * gnu/packages/patches/calibre-fix-zeroconf.patch: Delete patch. * gnu/local.mk: Remove reference to patch. --- gnu/local.mk | 1 - gnu/packages/ebook.scm | 103 +++++++++--------- .../patches/calibre-fix-zeroconf.patch | 38 ------- 3 files changed, 51 insertions(+), 91 deletions(-) delete mode 100644 gnu/packages/patches/calibre-fix-zeroconf.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3ae66803f2..06f906e75e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -918,7 +918,6 @@ dist_patch_DATA = \ %D%/packages/patches/cabal-install-ghc8.10.patch \ %D%/packages/patches/cairo-CVE-2018-19876.patch \ %D%/packages/patches/cairo-CVE-2020-35492.patch \ - %D%/packages/patches/calibre-fix-zeroconf.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 0875dae190..2cc1ae8ddb 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -56,6 +56,7 @@ (define-module (gnu packages ebook) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages javascript) + #:use-module (gnu packages language) #:use-module (gnu packages libusb) #:use-module (gnu packages libreoffice) #:use-module (gnu packages music) @@ -120,7 +121,7 @@ (define-public python-pychm (define-public calibre (package (name "calibre") - (version "5.21.0") + (version "5.36.0") (source (origin (method url-fetch) @@ -129,7 +130,7 @@ (define-public calibre version ".tar.xz")) (sha256 (base32 - "0mq2w8blq6ykaml812axakwkqcw85qcpfwijdikn7kvbrhnnp2s5")) + "1c036qmn7lxq0899c2xzzs6whz7z0557frnfqisbvfxa13b2sadk")) (modules '((guix build utils))) (snippet '(begin @@ -145,8 +146,7 @@ (define-public calibre (delete-file "resources/calibre-portable.bat") (delete-file "resources/calibre-portable.sh") #t)) - (patches (search-patches "calibre-fix-zeroconf.patch" - "calibre-no-updates-dialog.patch" + (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-sqlite.patch" ; TODO: fix test. "calibre-remove-test-unrar.patch")))) (build-system python-build-system) @@ -157,54 +157,53 @@ (define-public calibre python-pyqt-builder xdg-utils)) (inputs - `(("fontconfig" ,fontconfig) - ("font-liberation" ,font-liberation) - ("glib" ,glib) - ("hunspell" ,hunspell) - ("hyphen" ,hyphen) - ("icu4c" ,icu4c) - ("libmtp" ,libmtp) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo) - ("libjxr" ,libjxr) - ("libusb" ,libusb) - ("openssl" ,openssl) - ("optipng" ,optipng) - ("podofo" ,podofo) - ("poppler" ,poppler) - ("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-without-qtwebkit" ,python-pyqt-without-qtwebkit) - ("python-pyqtwebengine" ,python-pyqtwebengine) - ("python-regex" ,python-regex) - ("python-speechd" ,speech-dispatcher) - ("python-zeroconf" ,python-zeroconf) - ("qtwebengine" ,qtwebengine) - ("sqlite" ,sqlite))) + (list fontconfig + font-liberation + glib + hunspell + hyphen + icu4c + libmtp + libpng + libjpeg-turbo + libjxr + libstemmer + libusb + openssl + optipng + podofo + poppler + python-apsw + python-beautifulsoup4 + python-cchardet + python-css-parser + python-cssselect + python-dateutil + python-dnspython-1.16 + python-feedparser + python-html2text + python-html5-parser + python-html5lib + python-jeepney + python-lxml + python-markdown + python-mechanize + ;; python-msgpack is needed for the network content server to work. + python-msgpack + python-netifaces + python-odfpy + python-pillow + python-psutil + python-py7zr + python-pychm + python-pygments + python-pyqt-without-qtwebkit + python-pyqtwebengine + python-regex + speech-dispatcher + python-zeroconf + qtwebengine + sqlite)) (arguments `(;; Calibre is using setuptools by itself, but the setup.py is not ;; compatible with the shim wrapper (taken from pip) we are using. diff --git a/gnu/packages/patches/calibre-fix-zeroconf.patch b/gnu/packages/patches/calibre-fix-zeroconf.patch deleted file mode 100644 index d7d0f18667..0000000000 --- a/gnu/packages/patches/calibre-fix-zeroconf.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix a build failure when upgrading zeroconf from 0.28.8 to 0.38.1: - -https://issues.guix.gnu.org/53247 - -Patch copied from Gentoo: - -https://bugs.gentoo.org/800233#c5 - -diff --color -Naru a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py ---- a/src/calibre/devices/smart_device_app/driver.py 2021-08-08 08:32:03.104016444 +0200 -+++ b/src/calibre/devices/smart_device_app/driver.py 2021-08-08 08:33:30.699018403 +0200 -@@ -2040,13 +2040,6 @@ - # Function to monkeypatch zeroconf to remove the 15 character name length restriction. - # Copied from https://github.com/jstasiak/python-zeroconf version 0.28.1 - -- --from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z, -- _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE, -- _HAS_ASCII_CONTROL_CHARS, -- _HAS_ONLY_A_TO_Z_NUM_HYPHEN) -- -- - def service_type_name(type_: str, *, allow_underscores: bool = False) -> str: - """ - Validate a fully qualified service name, instance or subtype. [rfc6763] -@@ -2087,6 +2080,12 @@ - :param type_: Type, SubType or service name to validate - :return: fully qualified service name (eg: _http._tcp.local.) - """ -+ -+ from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z, -+ _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE, -+ _HAS_ASCII_CONTROL_CHARS, -+ _HAS_ONLY_A_TO_Z_NUM_HYPHEN) -+ - if not (type_.endswith('._tcp.local.') or type_.endswith('._udp.local.')): - raise BadTypeInNameException("Type '%s' must end with '._tcp.local.' or '._udp.local.'" % type_) - From patchwork Mon Feb 7 02:05:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37042 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 ADC4D27BBE9; Mon, 7 Feb 2022 02:08:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 41FC827BBEB for ; Mon, 7 Feb 2022 02:08:19 +0000 (GMT) Received: from localhost ([::1]:44452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGtRy-0001Y3-CT for patchwork@mira.cbaines.net; Sun, 06 Feb 2022 21:08:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGtQs-0001VS-1W for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGtQl-00080N-Gm for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGtQl-0008KF-CR for guix-patches@gnu.org; Sun, 06 Feb 2022 21:07:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53836] [PATCH 6/6] gnu: Remove python-dukpy, python2-dukpy. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 02:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53836@debbugs.gnu.org Received: via spool by 53836-submit@debbugs.gnu.org id=B53836.164419957131901 (code B ref 53836); Mon, 07 Feb 2022 02:07:03 +0000 Received: (at 53836) by debbugs.gnu.org; 7 Feb 2022 02:06:11 +0000 Received: from localhost ([127.0.0.1]:40506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPv-0008IR-3U for submit@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:11 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:39448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGtPs-0008Hc-0L for 53836@debbugs.gnu.org; Sun, 06 Feb 2022 21:06:08 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4: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 4JsTyL2sSvz9sTC for <53836@debbugs.gnu.org>; Mon, 7 Feb 2022 03:06:02 +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=1644199559; 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=Ilt0t5BsXNVuWhWtiH55iati49pKJLUWa621bvaiM+M=; b=d+bHL9MAxFItQ4MIcQEixtSYebe77gIw7xiAhGyLeP1/HMvOVOVYh0/CzrGy5E6jZ6j2O3 uZpUWPBhS1nk2g+gmhJoUUWoWlYXcRyMnTzgHur/uO0gojUsCsSerpzR5t+8k8yxgyhmup FfvuabK/M77hC7nOqUHgzO33CCoT0bwO7KZNJsJ/gryXXdAYNrSKiggTTsOVx9DqyJiqsi kC6izifa6JL22qjM5fp+LZHv9hOrtRoDWTX9TTZEVMlmJIlsL4tcZ90OHMNJ1VvOiNZC60 saxCSmyqQLs29SkDSsSNtGoYIYSzx88Uir4QnveYlU3swF+OtozxqICHYf0pGg== From: Brendan Tildesley Date: Mon, 7 Feb 2022 13:05:42 +1100 Message-Id: <20220207020542.29004-6-mail@brendan.scot> In-Reply-To: <20220207020542.29004-1-mail@brendan.scot> References: <20220207020542.29004-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm: Remove unused packages python-dukpy, python2-dukpy. This is actually not the 'dukpy' package in pypi either but something else made for calibre. --- gnu/packages/python-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5a33dc05bb..3410a5c5a8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20495,32 +20495,6 @@ (define-public python-ratelimiter (define-public python2-ratelimiter (package-with-python2 python-ratelimiter)) -(define-public python-dukpy - (package - (name "python-dukpy") - (version "0.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kovidgoyal/dukpy") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "13h21nqzasv4zj32xs61brmc106pr2cx243672crcmwxxnjgaxls")))) - (build-system python-build-system) - (home-page "https://github.com/kovidgoyal/dukpy") - (synopsis "Run JavaScript in python") - (description - "dukpy is a JavaScript runtime environment for Python using the duktape -embeddable JavaScript engine.") - ;; Dukpy is licensed under MIT like the embedded duktape library, - ;; with 'errors.c' as GPL3. - (license (list license:expat license:gpl3)))) - -(define-public python2-dukpy - (package-with-python2 python-dukpy)) - (define-public python-jsonrpclib-pelix (package (name "python-jsonrpclib-pelix")