From patchwork Sun May 7 13:26:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 49853 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 E411427BBEA; Sun, 7 May 2023 14:28:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4694B27BBE2 for ; Sun, 7 May 2023 14:28:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pveQm-0001OZ-BV; Sun, 07 May 2023 09:28:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pveQk-0001Ny-SY for guix-patches@gnu.org; Sun, 07 May 2023 09:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pveQk-00011d-K9 for guix-patches@gnu.org; Sun, 07 May 2023 09:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pveQk-00057V-CE for guix-patches@gnu.org; Sun, 07 May 2023 09:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63348] [PATCH 1/4] gnu: Add rust-unindent-0.2. References: <87fs88uvo4.fsf@gmx.com> In-Reply-To: <87fs88uvo4.fsf@gmx.com> Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 13:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63348@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 63348-submit@debbugs.gnu.org id=B63348.168346602819573 (code B ref 63348); Sun, 07 May 2023 13:28:02 +0000 Received: (at 63348) by debbugs.gnu.org; 7 May 2023 13:27:08 +0000 Received: from localhost ([127.0.0.1]:36707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvePr-00055b-MY for submit@debbugs.gnu.org; Sun, 07 May 2023 09:27:08 -0400 Received: from mout.gmx.net ([212.227.17.21]:52011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvePp-00055E-KA for 63348@debbugs.gnu.org; Sun, 07 May 2023 09:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.com; s=s31663417; t=1683466020; i=pierre.langlois@gmx.com; bh=pdXuPXqEhpm8xIezbOMy9coImDYdbCkovdG0prhbuOY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=EFpJWc5WY/N5jqPwFcnNlTKgb4hgy4CACNM5jwPRCKHW9B3TovmND8gnw/w2evo9A kSpW3tvag/qKb2uut49p/WI/7viZ6/lUfHQN9cxSgvU3PvAW6oxq6TY8LjH/ImhfUC hrg8zBxBEF7G91wtRPddfGJBghlQ8afC2h/AgItE3aI5mQNHD0ESo4yf5EX7SUYFUx NmOnh9FBwV/H7Z8jr/SD+O/dgxpDaaqmkzfXpXOyhIjcZa2rNtGjn4fzXVqMB3q4tP 7ayB7xk/A8eK2SdMadWxebTAiFl5D6cmvdvVhYWN7o6U+67wF7GpixtSVN+CPam5fe B/z/2Io+OmkeQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M6DWi-1ptTcx3LSK-006cMj; Sun, 07 May 2023 15:26:59 +0200 From: Pierre Langlois Date: Sun, 7 May 2023 14:26:19 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:FJ+9O8JUq4yf/Lqgmw1S4nRc90KpR9ee8IpBNEplyiiqVPZT46C nwOll+xNeLPcwoqz7/7XOPdX3eM/DZpIiC4AumECUKii5PIkZLWu09aKR7T3DRHPlULGaIO WQNwkaUePUUIUb16w6ELJFzr6ZFgmmAeyYcbsjjLBbPKMiDzc48kJ/hQauCWqsIy+9a3qiS NLpNIoOVKdz5BCBej1KTA== UI-OutboundReport: notjunk:1;M01:P0:7/Rkw4IjEjY=;6Ls6CQF5usfPyXpk58m0+KJpkHV zubTi8MOO/STK+Z7zQ+POOq/3auTXZ7vBeBclV+K4O8r8abg5ftAhe+4EATbDSenRj1TxwxrC xiKZdGPkCBNMKFDj0myqqX/75Hyt/7Ly1RgeGyS4NTX1XFeRpcKR6rjM33LVNijzT7QDnvmlV dPKIA+gI5ipwLIHnj+6I133xCOAxYVbEmt/SJ99E2XnjNaKIA5pWV6bQKUdDy7yGYgaNkn/4R X5z6LiQpXctNzcjIdLnenrS+OIknyWP/Dlhdktpv+ApYiGD/G0/1vJ7G99KB3LA+6YhrQuf+y XetQDIz9+CkxvrdQfqSafwan77pql54Oo0Ao12tYFGOxBrWqII/9xFLQ5WSA/WOBySj6dzioI 6t6Iem2X1iM7do0/5gnzL6cJU/4GeYfQJurDc6XwutiVIMungCIqi/pv6DX4C1RGmJEYLsLBn RF5/HcwZmiTPR1iG7DdR78H8zFXRJpZnQt51iJ6rHGTaGYNrEe6Al241C78CFPzBUgfI/aNha 0u0qMysxIyVnYkMeQMPyjQ5t8AClJGF7+7TjCJNHOTh73YrbXKqd4xH9YHCLU3XwaDOYWjcr1 QnR3x/OPmRj0yFhG58A0okTsoqoLqJ+BmiOhargRUFtqp4ntp0btnI4zRPPymWj7nWOiGy4BL rqKBg29ovMHjWIekEYi8y85Oo6OZJzSmoMc2VacP593yIcBek3EEi1+cOStpg6AX964svZCyz 9lDYZadRQYW+m5AgRkg5eqMpwNpwF4CsPrxKqREY370aFTZ98xSJn7AGs+8D50n90K4VD33X2 NkmhCBb9adpuN9i9u9HaRqWT6gUmEjIVUFkKND1xIVpTF5eyadYhAwShmR20HtcCZCwh+kS5q mw/RgVz6YmIybZe+2JqZ1kzhFcdYoRyBVXDJuF3PkutrRrYUOaqQ1OGEShjQpCHOArdk/GYYn xYRerVNYOqfNldNsrO+yXvJF4jc= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-unindent-0.2): New variable. (rust-unindent-0.1): Inherit from rust-unindent-0.2. --- gnu/packages/crates-io.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) base-commit: 8b855dc1f4a3e31c002c229ad4d91525f4ce97d3 -- 2.39.2 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a8f4c83336..6faec522e0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -65823,17 +65823,17 @@ (define-public rust-unicode-xid-0.0 (base32 "1p5l9h3n3i53cp95fb65p8q3vbwib79ryd9z5z5h5kr9gl6qc7wc")))))) -(define-public rust-unindent-0.1 +(define-public rust-unindent-0.2 (package (name "rust-unindent") - (version "0.1.7") + (version "0.2.1") (source (origin (method url-fetch) (uri (crate-uri "unindent" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1is1gmx1l89z426rn3xsi0mii4vhy2imhqmhx8x2pd8mji6y0kpi")))) + (base32 "0kw1yivkklw1f5mpcwakxznwzn6br2g3yvbwg7yfvxqzlmg0z8ss")))) (build-system cargo-build-system) (home-page "https://github.com/dtolnay/indoc") (synopsis "Remove a column of leading whitespace from a string") @@ -65842,6 +65842,18 @@ (define-public rust-unindent-0.1 (license (list license:asl2.0 license:expat)))) +(define-public rust-unindent-0.1 + (package (inherit rust-unindent-0.2) + (name "rust-unindent") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "unindent" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1is1gmx1l89z426rn3xsi0mii4vhy2imhqmhx8x2pd8mji6y0kpi")))))) + (define-public rust-uniquote-3 (package (name "rust-uniquote") From patchwork Sun May 7 13:26:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 49854 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 D3A0227BBE9; Sun, 7 May 2023 14:28:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 139B327BBE2 for ; Sun, 7 May 2023 14:28:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pveQm-0001Og-JA; Sun, 07 May 2023 09:28:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pveQl-0001O6-8p for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pveQk-00011q-TH for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pveQk-00057d-Or for guix-patches@gnu.org; Sun, 07 May 2023 09:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63348] [PATCH 2/4] gnu: Update rust-tiny-http to 0.12.0. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 13:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63348@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 63348-submit@debbugs.gnu.org id=B63348.168346603619597 (code B ref 63348); Sun, 07 May 2023 13:28:02 +0000 Received: (at 63348) by debbugs.gnu.org; 7 May 2023 13:27:16 +0000 Received: from localhost ([127.0.0.1]:36710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pveQ0-000561-4v for submit@debbugs.gnu.org; Sun, 07 May 2023 09:27:16 -0400 Received: from mout.gmx.net ([212.227.17.22]:55295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvePy-00055l-Ct for 63348@debbugs.gnu.org; Sun, 07 May 2023 09:27:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.com; s=s31663417; t=1683466028; i=pierre.langlois@gmx.com; bh=YZnfdUJCSrO/SFm+QHX/FuKJ+ClzFoQ49yx/QM0lUrE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=EkPpGOFl6CCZxwPW1OwblLnPsgTRPgNeK2wq+p02Ex8Oqrh9q5npsLNjYZ9i2l3dN n9zL1qVoPvADCAu8xCM6NefME3vuKF9LCyVEk8pyKPgCqdbVPzrrP3GxI3/V6M25Kb IYVfNLR6XJGS+wS3ekBACoP30wpcD3w4nI1bn1Ya8wNcQjN2wHiqE9CI0rqpm7qmGG T5BFx7mF8DzeOoeluV9tllFYpUosgzhg2OFWBmN8QZKVd7T1rXZeb/dLu5LfCvov1X lGSPkTMhSr8mqlioijtdRlyY/1ExZ1EOdY8M2DeQSccECJMqGpieGhDPRCyR1a1YVk NTexkMcO0RH9A== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N5VD8-1qJDjq1usE-0170Pb; Sun, 07 May 2023 15:27:08 +0200 From: Pierre Langlois Date: Sun, 7 May 2023 14:26:20 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:UghOXylsAsbjhW1zZ8kLP//2AwrONTgM7D347rgOajDD7PZeN8g rJj70jXQnLIgX2vWCSyA/JjUnNA2zdyt8k1m+SCfhVJEzSALps7oSwgwoUJPyHdRjW/igQU mh47ybe8CCpwz4/1dWYWMhK/1dn7E2v/MNqPe1gWk72aq5FVVVEkg4IZyuNyXyJMMffnDH2 RZqMbL3ANz7vYzNREs3AQ== UI-OutboundReport: notjunk:1;M01:P0:iVZ6Lpki5wI=;US9uzB/vWc+2K6cO8pbV20UnbeU lXLlDt+jTjFFys34S2XrlFo/HSZ0mFPsQq5TzHTZWWBrxZgdgG/VoHb8Z4PuwOonCLo6SDV/+ lFTIF5NL8xYqU0pVmyRT4S89hvveGTiVC7o6ENbEUvZjZfFpMyuwYos33u5zujD48dC0616vE 4ASGFQ7JkduUuma3TL3L5VE7cwUYQr7U7v8btnuh+pL57dgFz2SDwvXF7bPhRaL9YfP8J4Wl3 8JFlfvsUNECe7hD2lm62zDURwpZoezT2VTv7RmjY78UqPx0+pmELqfTyw8HfRA2blq7GYpSf5 527je3KgG4K+ifI6ygbboOfByVrP3XWiXVqZGEqtUnq3yMjQxEteL1WKfbr334uQk9i/uodIH fAWGzn8ZNoRnaipr5YV5BU2AAgXza2eGUux6dHpJJ38QRcgfwKPfy+gOj+mKUZlKhYSv8xHDo 07zlGpX0Sjb/YrET/ZY9R55bsV9yNJEKP0bJPzlUbrjyNVOocXBaO19h4gj6AdQwc3jbfvj3d MXNlo6Cj7W2zh5l+2btAZENBmxBwcjQpawk25/2s4LgSFowYzG5mfXRKM5nWZbq6Ku4JnONmC WH5QLnlU1YA0W+53Xa+rFtary5qL/wj/z3Vc2OBaedxX30HXpob1HfluDMI2B2Gwtjk5unYgS mFMX7wNmI5I0Cc/nqyid33hImdHo5WHL8R8cZJYvJlnp2qXQZ/2TyOYzlGJiBYYLw/4sos/HS DKbw6sghwEfLOXVlFj+4tHg4OaJzcKtYhU7kfwMgsrTkQ2n/wQQAMPY2gxJmqL1tkRTZQ7ZxL AZD70MQ/4k+wsT06QOgL+U2E6zpSvE6/VqsDm6Q9DlfyUtBFyuBA8MScdNPrRjTuWapljzy9j YjuzdZx3BifNq9V7I8092PBOX2xmE5kQxSyFYDNroFMeKjY0X7DuMuZw5pdqm3r+SdSYvLjZG mi9hIw1GavCZJATClGsxJcmUpTU= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-tiny-http-0.8): Rename to... (rust-tiny-http-0.12): ... this. [arguments]: Remove rust-chrono and rust-url dependencies, add rust-httparse, httpdate, rustls and rustls-pemfile. (rust-tiny-http-0.6): Inherit from rust-tiny-http-0.12. --- gnu/packages/crates-io.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.39.2 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6faec522e0..22eeceb2fc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61046,26 +61046,28 @@ (define-public rust-tint-1 manipulation in Rust.") (license license:expat))) -(define-public rust-tiny-http-0.8 +(define-public rust-tiny-http-0.12 (package (name "rust-tiny-http") - (version "0.8.2") + (version "0.12.0") (source (origin (method url-fetch) (uri (crate-uri "tiny-http" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fcdwpb2ghk671qjjrk6048hs3yp7f681hxpr68gamk00181prcw")))) + (base32 "10nw9kk2i2aq4l4csy0825qkq0l66f9mz2c1n57yg8hkckgib69q")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-ascii" ,rust-ascii-1) - ("rust-chrono" ,rust-chrono-0.4) ("rust-chunked-transfer" ,rust-chunked-transfer-1) + ("rust-httparse" ,rust-httparse-1) + ("rust-httpdate" ,rust-httpdate-1) ("rust-log" ,rust-log-0.4) ("rust-openssl" ,rust-openssl-0.10) - ("rust-url" ,rust-url-2)) + ("rust-rustls" ,rust-rustls-0.20) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-0.2)) #:cargo-development-inputs (("rust-fdlimit" ,rust-fdlimit-0.1) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) @@ -61077,7 +61079,7 @@ (define-public rust-tiny-http-0.8 (define-public rust-tiny-http-0.6 (package - (inherit rust-tiny-http-0.8) + (inherit rust-tiny-http-0.12) (name "rust-tiny-http") (version "0.6.2") (source From patchwork Sun May 7 13:26:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 49852 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 2B36527BBEA; Sun, 7 May 2023 14:28:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CF07227BBE2 for ; Sun, 7 May 2023 14:28:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pveQm-0001Oc-G2; Sun, 07 May 2023 09:28:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pveQl-0001OD-IK for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pveQl-00011w-AQ for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pveQl-00057k-5r for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63348] [PATCH 3/4] gnu: Add rust-webbrowser-0.8. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 13:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63348@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 63348-submit@debbugs.gnu.org id=B63348.168346603919611 (code B ref 63348); Sun, 07 May 2023 13:28:03 +0000 Received: (at 63348) by debbugs.gnu.org; 7 May 2023 13:27:19 +0000 Received: from localhost ([127.0.0.1]:36713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pveQ2-00056F-Em for submit@debbugs.gnu.org; Sun, 07 May 2023 09:27:18 -0400 Received: from mout.gmx.net ([212.227.17.22]:53333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pveQ0-00055n-GW for 63348@debbugs.gnu.org; Sun, 07 May 2023 09:27:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.com; s=s31663417; t=1683466030; i=pierre.langlois@gmx.com; bh=fwYIypa5LmABw7t9QTTOXGphjblUlcbkhqs1d92Mt7c=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XIbdL10TYu6ZxVp5GgyG3Tu5aXQ9gbnms26chSrnscnvNx41hGZ8Vtj5k73A8F+F7 nAvkgHBBgaUA26oN843Uw6X6XAkHtpIf8qWAsXqcVz9E2DhlYayC40gdJ94X0uNc1I e6w/QYXP73FcyUUOjYMuu86IJ5mmDoGgFm4sZDHs2bylQsolRm/Q+QyMcTfLifTTF4 K7ZQHRGurZdiB54Zz/7MOwRN24ajCtym97DBNipZ8JBPP4zLc4mR5+nbSklG9qYRCL PYIO2hJk6Z87QMesVBMQ4prqxmJWZBXBq6xlYxCdzmKm26BPlNmMwwwYERPaC9kk5S tGdSfAJ1PCsAA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MuUjC-1qCd6S34Jm-00rZ1H; Sun, 07 May 2023 15:27:10 +0200 From: Pierre Langlois Date: Sun, 7 May 2023 14:26:21 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:Wbp/3dEx0QEDD4zb2A48cYeREoCExBaAi8I8VAs8xbjhUeqcw+2 I3CqTv1uPgrFAJc85Ult0R/HU71n/Uhk1GK9PuizbRkEwNcYFJRVvwopKi57bHbdJ5sbcfr G0YMyaK5gONFEh7AOaqPUjnOhEbfN53oPnRyAG9U4HSUZFq2UgiFu8N4tUtsjmWEy06AUX2 wFoYASTQ6mDGb5+GnE6dg== UI-OutboundReport: notjunk:1;M01:P0:/KpxlAfwhKo=;GW3GvJlfHlZXA5XlSZ/QhyJrHA/ LKYZSlWFivS8usdPE0ER2plcFsWcN8Hut2fXymFG7Xkw2ZOW4P0i0Vwvi2hCo31y/+NQjWvia quP+AJZo7iwIRy+Ut2QSC/R/RmxPO6w+gSTmOlDjnNGnGt4BCNE5OscKmQuQT1eqfuedPdn7j r5JUBRi8PezH8aoqikdlqoyZA0muR24NbpCGadSajnzOewkhiI6gDaS68V9sRs4g8nXvHuDN4 eKFhvP+BH4iRBLqZnFQBVUI5mRnFBmuxU3Ixzp/mpTRT0cA9Cp1mEVK+EY9iJf0/IMN6PlIv1 MVFC4MRSd9Ie/cfsV7DbfiMO3xSiEXq4NXJKB/cpFhRycMWnuttv9Z2T6DJrGmz3mVA6EKhJW l/79XCf52GxJcx+kAZNYAcIh1Y7lTVQIwIXBt8UtAzaVYq/eXCs8hq1oUfrN12FBYkNmIMHE6 DM8HO1YdkX03Ui4T0fa/+6JFby4drWOKLX1ShEoLKRjWAgyk/UVKnz2OEY7XQV2pKp8knlrIM EDZJadzwNltuQuieZmzUMm1V0FuXbJRBiW8DUAsImeqTM6HDPsaWRZID6M9eR0IMd4rDv5qXi huC8iff7qUO5sZTlUGXY2erVpc70AOb8l7w8asrcj5LP1bGDhx4tj1ev/MG066NkNxtYJ/nzt 0Psx1bwvutCpTqitlz61LMFRxgJG/lwjAjG9zH1TjnJI4+i9KEX3yMWZJAwEj8ltpKP67l0tf pc06WUriX2ydBllsTXe4V66SblB2btqCIXbl+ICE0dFfUeLEfZvMwwqb8pxMXJhfDVQTX1sVr hURX1AATx0U2wqwQg363Di55KHC+v1uwg+tbxpPifnsHqw+vBV1z+9SMbzq7Y0aTyPy92yRfm OWfCTY+LYVKghIDFszbPWp5NTjo8LV9aFDe6yzUP2kTGZjoNbvpu1SHA32qeQPM/uemZzyvkG 8CfUK4doVoYbWCV5Tkjy08Gh27M= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-webbrowser-0.8): New variable. (rust-webbrowser-0.5): Inherit from rust-webbrowser-0.8. * gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch: New file. * gnu/local.mk: Register it. --- gnu/local.mk | 1 + gnu/packages/crates-io.scm | 39 +++++++++++++++---- ...ust-webbrowser-remove-unsupported-os.patch | 24 ++++++++++++ 3 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch -- 2.39.2 diff --git a/gnu/local.mk b/gnu/local.mk index de5ac37ba5..cda612274a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1872,6 +1872,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ + %D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 22eeceb2fc..d912441f4d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -67832,8 +67832,38 @@ (define-public rust-web-sys-0.3 "Bindings for all Web APIs, a procedurally generated crate from WebIDL.") (license (list license:expat license:asl2.0)))) +(define-public rust-webbrowser-0.8 + (package + (name "rust-webbrowser") + (version "0.8.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "webbrowser" version)) + (file-name (string-append name "-" version ".tar.gz")) + ;; Explicitely remove dependencies for unsupported operating systems, + ;; to avoid pulling many dependencies and causing rust world rebuilds. + (patches (search-patches "rust-webbrowser-remove-unsupported-os.patch")) + (patch-flags '("-p0")) + (sha256 + (base32 "0zk1qidyksspa8pgvq8bh2lyqmmrs0fr5r1qsyhbzrawpn2w972p")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-dirs" ,rust-dirs-4) + ("rust-log" ,rust-log-0.4) + ("rust-url" ,rust-url-2) + ("rust-web-sys" ,rust-web-sys-0.3)))) + (home-page "https://github.com/amodm/webbrowser-rs") + (synopsis "Open URLs in web browsers available on a platform") + (description + "Webbrowser-rs is a Rust library to open URLs in the web browsers +available on a platform.") + (license (list license:expat license:asl2.0)))) + (define-public rust-webbrowser-0.5 (package + (inherit rust-webbrowser-0.8) (name "rust-webbrowser") (version "0.5.5") (source @@ -67849,14 +67879,7 @@ (define-public rust-webbrowser-0.5 #:cargo-inputs (("rust-web-sys" ,rust-web-sys-0.3) ("rust-widestring" ,rust-widestring-0.4) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page - "https://github.com/amodm/webbrowser-rs") - (synopsis "Open URLs in web browsers available on a platform") - (description - "Webbrowser-rs is a Rust library to open URLs in the web browsers -available on a platform.") - (license (list license:expat license:asl2.0)))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-webpki-0.22 (package diff --git a/gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch b/gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch new file mode 100644 index 0000000000..9fea1e1665 --- /dev/null +++ b/gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch @@ -0,0 +1,24 @@ +--- Cargo.toml 2023-05-07 13:39:13.029066693 +0100 ++++ Cargo.toml 2023-05-07 13:39:22.545138206 +0100 +@@ -67,21 +67,3 @@ + [target."cfg(target_arch = \"wasm32\")".dependencies.web-sys] + version = "0.3" + features = ["Window"] +- +-[target."cfg(target_os = \"android\")".dependencies.jni] +-version = "0.21" +- +-[target."cfg(target_os = \"android\")".dependencies.ndk-context] +-version = "0.1" +- +-[target."cfg(target_os = \"android\")".dev-dependencies.ndk-glue] +-version = ">= 0.3, <= 0.7" +- +-[target."cfg(target_os = \"ios\")".dependencies.objc] +-version = "0.2.7" +- +-[target."cfg(target_os = \"ios\")".dependencies.raw-window-handle] +-version = "0.5.0" +- +-[target."cfg(target_os = \"macos\")".dependencies.core-foundation] +-version = "0.9" From patchwork Sun May 7 13:26:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 49851 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 C4B4427BBE9; Sun, 7 May 2023 14:28:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EFB5227BBE2 for ; Sun, 7 May 2023 14:28:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pveQn-0001PN-OJ; Sun, 07 May 2023 09:28:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pveQm-0001OS-1W for guix-patches@gnu.org; Sun, 07 May 2023 09:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pveQl-000125-MS for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pveQl-00057r-Ia for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63348] [PATCH 4/4] gnu: tree-sitter-cli: Fix build with 0.20.8 version. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 13:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63348@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 63348-submit@debbugs.gnu.org id=B63348.168346604119629 (code B ref 63348); Sun, 07 May 2023 13:28:03 +0000 Received: (at 63348) by debbugs.gnu.org; 7 May 2023 13:27:21 +0000 Received: from localhost ([127.0.0.1]:36716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pveQ4-00056W-UT for submit@debbugs.gnu.org; Sun, 07 May 2023 09:27:21 -0400 Received: from mout.gmx.net ([212.227.17.20]:60277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pveQ2-00055r-R4 for 63348@debbugs.gnu.org; Sun, 07 May 2023 09:27:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.com; s=s31663417; t=1683466033; i=pierre.langlois@gmx.com; bh=HBiFUCx62LBb7DXqemIldvJB/fiYT32ZCuH9uLEtOBY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=O0qxUY45RceERaupYSZ2YZ0lfMaugqrQy9yOpjLEjcpIW1T0a2nB3+zdvC8T3jCIm qkF/GrzwCR+bEj3reTnYaz4/nVlz6gRvI/ND4uGhsdaivoQ+yqpcL8hIv5iA0f4ufV ufQom1IYjeywdMG7jjsiBxrq37Mv1p/Bupq9aEmgcSVpZUO/RCWts1aDSgJ1fRFGf/ ANl9FUy+bh1ur81ZFoKLe+8jxi6uyuQg7J//Oy8OI7AhUc1/8ew68zm2Invzv3f9y2 u0eiUSLUBLwJ7Ko81MxoEM5TgGhVfDRQJq2Vw4PGRurds3mWrrb0Ffx2dkuGVNmecM oBt9XpdfxkLdA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MqJqN-1qYGXr46BH-00nQ9q; Sun, 07 May 2023 15:27:13 +0200 From: Pierre Langlois Date: Sun, 7 May 2023 14:26:22 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:VwUMaWXuxkhNLQ3rf3osAbk8ygYR+i+1iARdKvPsf7KnP8Vn3yA SYfVry5Nl/CAvyv+cQnUE94Csl1WEb8H0LC0rIiuMsdK9IZUjScMIe8Ie5fC3kIEUTPAmQV IZ6PMQCIzbqP413GFDH36JI9CLPQ2hzXSkJX39VLxz1Rtzba9DHjzPUvxB5fs3rE/2xHHoY wYoAY0CZQS+rpWGAN/Z6Q== UI-OutboundReport: notjunk:1;M01:P0:p7GrJLdhINo=;9oogl2D5oXX7dPVDfBv2WL3XzOU EqOH45Ni+JWfuGt+xelYcFMR2icSIgW9+1AhzxAs4Ubxgb/W1f3aRBKYtRGWjAzN5ah/ptyze N1MP8hWopMZa1dncn+un6ujr1aiFfBauc88t7siImQ970se9KMgztWSJ5/LY5gbVt/ylrXBm/ XQrIIO/tK2A7EQtEfiCMn9OmqrpSi3PjbR0lnLIZrTHyfk0eAwu4vCjAmZLO56plOGTc75rba v6ubmQ5WPbW2+d6Bz4UaYMu4UCmhRC9hBMKC59F4dzFRX04+xKg9oEk15o2ZtV8W/PwpDtA13 ugsxbLRNSMOmjWAl6ciu3cXc0T21FjvjD5T6xTOT/1b/ALtmkQ7E7o85JGwsJwN+MdOQR5t6r NvMV5OWYvXddCxz8frlp5bMOZvZkOvC2alxySi+jLAM5/OBxSc7G6uc/CRg6/9o4EbwO5OU9F HeT8ti07c20ewyH7zYVUlCNKkbQR5j0cOnnUgxxRISufbR6rSMXAGUa4zfwQas8nRBb+phdtJ CHe6BmNKQwiGdQ4Jaxi+G+m9poyOLuu/K204PzQFDvEL9+iLoPKzoMKxbM3S4abHxUB2x1mPT esWoKJjkJJCgTp04OVgg+8OgfdVPsBimdNZnqDdY6nvobTCVSO/piB+gw3acyD6e3wiXoCyFL nQAlYdGkwCzTKUwaumZsqUXr/6bzJWB9sEncqeVN1eUDcnf7bHARKfusDSob0qsi39tK8Ga4H 8qULl9ZFWtpYDp5uQL3j2WfL/6BlIS/R03/I5xjxDmps23FOvH+0oeav/WOVEEKcG3sltp/VH GzdOkgAQoKNyQd1Jcx3iQ1snTrhVPvKyJfknL2JSvQAkW81Jgf9jAq0rjKhgOzqrZAGxOi50j NUCH9UKa4hEES0nFslp2S9l0wld5nBA7efReoxlGqzAvT8eJ4I4TEG6nu6lJyIdb072WjeRyu BDe0SnUX/cyhkhom1d438tozpfM= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tree-sitter.scm (tree-sitter-cli)[arguments]<#:tests?>: Disable, building tests requries rust 1.65. <#:cargo-inputs>: Update rust-tiny-http and rust-webbrowser. <#:cargo-development-inputs>: Add rust-ctor, rust-rand, rust-tempfile and rust-unindent. <#:phases>: Add 'allow-rust-1.60 phase, to remove the requirement for rust 1.65. --- gnu/packages/tree-sitter.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- 2.39.2 diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 386409914b..4e680df765 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -104,6 +104,9 @@ (define-public tree-sitter-cli (list tree-sitter graphviz node-lts)) (arguments (list + ;; FIXME: Tests rely on rust 1.65, re-enable tests when the default + ;; rust is new enough. + #:tests? #f #:cargo-test-flags ''("--release" "--" ;; Skip tests which rely on downloading grammar fixtures. It is @@ -141,18 +144,29 @@ (define-public tree-sitter-cli ("rust-semver" ,rust-semver-1) ("rust-smallbitvec" ,rust-smallbitvec-2) ("rust-thiserror" ,rust-thiserror-1) - ("rust-tiny-http" ,rust-tiny-http-0.8) + ("rust-tiny-http" ,rust-tiny-http-0.12) ("rust-toml" ,rust-toml-0.5) ("rust-walkdir" ,rust-walkdir-2) - ("rust-webbrowser" ,rust-webbrowser-0.5) + ("rust-webbrowser" ,rust-webbrowser-0.8) ("rust-which" ,rust-which-4)) #:cargo-development-inputs - `(("rust-pretty-assertions" ,rust-pretty-assertions-0.7)) + `(("rust-ctor" ,rust-ctor-0.1) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.7) + ("rust-rand" ,rust-rand-0.8) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-unindent" ,rust-unindent-0.2)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'delete-cargo-lock (lambda _ (delete-file "Cargo.lock"))) + ;; Remove rust version restrictions in Cargo.toml files. + ;; FIXME: Remove this phase when guix's default rust is new enough + ;; (1.65 as of version 0.20.8). + (add-after 'unpack 'allow-rust-1.60 + (lambda _ + (substitute* (find-files "." "^Cargo\\.toml$") + (("rust-version\\.workspace = true") "")))) (add-after 'unpack 'patch-node (lambda _ (substitute* "cli/src/generate/mod.rs"