From patchwork Sun May 7 13:12:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 1478 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 2D96E27BBE9; Sun, 7 May 2023 14:20:20 +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 85CF427BBE2 for ; Sun, 7 May 2023 14:20:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pveJ1-0008QP-Gr; Sun, 07 May 2023 09:20:03 -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 1pveJ0-0008Py-3q for guix-patches@gnu.org; Sun, 07 May 2023 09:20: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 1pveIz-0007CC-QJ for guix-patches@gnu.org; Sun, 07 May 2023 09:20:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pveIz-0004sJ-KL for guix-patches@gnu.org; Sun, 07 May 2023 09:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63348] [PATCH 0/4] Fix tree-sitter-cli build after 0.20.8 update. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 13:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63348@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168346557118684 (code B ref -1); Sun, 07 May 2023 13:20:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 May 2023 13:19:31 +0000 Received: from localhost ([127.0.0.1]:36684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pveIU-0004rI-Gy for submit@debbugs.gnu.org; Sun, 07 May 2023 09:19:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:44382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pveIT-0004rA-1z for submit@debbugs.gnu.org; Sun, 07 May 2023 09:19:29 -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 1pveIS-0008MA-Bn for guix-patches@gnu.org; Sun, 07 May 2023 09:19:28 -0400 Received: from mout.gmx.net ([212.227.17.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pveIE-00075C-5H for guix-patches@gnu.org; Sun, 07 May 2023 09:19:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.com; s=s31663417; t=1683465520; i=pierre.langlois@gmx.com; bh=9TGsuGFmiIO/dfdLHh1JhTT+jXqCZpHkolo/RPL+cQQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=nvwOIwCz2s7bkETMy+r81jEY0dcV8ddFr/YkBHeWMzbRJ/y6829UGG0ahqErxYzoZ 1qgqGrzbgh9/Rxx/qlhyVJ1IFiUjHSHkvyZRQplGjUrkgQ8n8jdcBJpt1lSggrpMlT VrK3OYA+iaCk4zY16K7544serOY/MIhIH9vlmVvp1/gUidXS59mpMP6CBAM6PSjoVu LxEx7kP5n/zS7a/hEXwIju399D5r6lSlYR1ibEqUaVCa6A6gsXhILRBGMVSplgsT/z Lbk+jFaR/hkkNh8yFffv9a/Dt0vAx0tR47zxrYXW/9EwE5kjfhM5HLKBWfCg6sqVPu NaGJJVWK9QFwQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Ml6qC-1qeZwa0pG0-00lR2o; Sun, 07 May 2023 15:18:40 +0200 User-agent: mu4e 1.10.2; emacs 28.2 From: Pierre Langlois Date: Sun, 07 May 2023 14:12:02 +0100 Message-ID: <87fs88uvo4.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:+JKaPZUWArFShB9sSgD2YX507e6yme019mV7cQs/Z/xZCUpm8Or m+a+MPx2DV//PHk4xPL0LBPoGdQV4q8J0alV/nX5vn+KWO1Jy73hUDv9zcazfaiQnwEow4v tegL9mkAUWBlR1jMjWH1XWTdVaG5waPQCkouqlXdoRVutGm6E4mj+DsXOuJS1QaYgaYJp1i hHepcdBpGgYsxOd0P44iw== UI-OutboundReport: notjunk:1;M01:P0:WDFqWiY7K+o=;58KFmPwk/l5Yvwm3dJMRGirzQgY 73/DhFS8h6EoeIZkDWRSqrRARwdN8Z6d0mn1UcxnXlqSjybg8m8fwyJ9KoIsQdoOUo4xqX+Gl XEjz2WSbvrJtlsguK4QwWTiroNVrpDtDXTU0OhIl5Bal9BA8vTfwW/QlhB1+byrNvHjfbHp0K wWWWzs2olvUbiMgDivoUWKgcxNmvqwDzPeoN/1NO1jDF+Zk7Gz8ZrcCQJnIHqDcUEQIkf81g0 2LF+dGEs9KyjV5SqM/TDj53RPN5klgTj3gSZ3Pyrfb07JDOGYDFIA2CUHB1ugAFGTvjmfmH+L nmC7YYLmMpqoMHrw2VVxctzqWAAvO2GObqpddoE5hncKe6VAHifsQ02gcrr11U1/BfAO1c1Cw ZNKuXCpsL2xLi0OSKvHX2W5r8PzykXW5xfwY7Zaej2P5C5xwox8SdYjeWWApbwIHBMp3eGnmu vxbQaLCvgD4OXoVRmemR+g5CPbD8IG1TK+rIIAoOIt3dKMNHl16gcInPCrn9Gt++cx6eTIFyd iTwaDAtqkOY1LlmqbRG1FS5h5DpMLxP2hB9M0SapDmV7CLlIzeU7ChlmwMJa9ZFIoJZfi974w BN2e9Ce4zAlLg+WJejsqcTUJkJJDhTexs50HFdGTvb6pdOX2Z1QJmypmvhhuTCUVD0nTlIgQ0 mBEH+QwJlb2r2dgYFKHvcBVF+ucLNFZ5rsG7N41PwQK7yGEHfVryRWEeuwhHjxlDDpMj8j/hM /6B0T0Z6ExH25zvljynJOOBfV75wcWSK8DkjjiEgl3+7sXt/oOXsAxXsERwP/RIgBUb+gNpd+ 3iPT84c8svDz49Vgo01PQchENFCURMa/wiPoSA3OlXXCWQztLzwzsY1lHB0fFAAFnQQHHtYmi EqKSUGPrOAoWSnOBwK/17fM8fPbZnREK6bb1+fArnG0S54FHTjKNdEsqmsxdwbhLKs6zkS1lC UVE/Mk2KY/mLTy6XswE0xJc3GDc= Received-SPF: pass client-ip=212.227.17.22; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hi Guix and rust-team! This series completes the 0.20.8 tree-sitter update by fixing the tree-sitter-cli package. I actually had started working on it a few weeks back, but never found the motivation to complete it until now! Sadly, to do it I've had to disable tests, with notes to re-enable them later, after the rust update. It seems that rust 1.65 is explicitely required now: https://github.com/tree-sitter/tree-sitter/pull/2167/commits/da894afef59e1aefa23470c7db7445096f8f0e65 However, luckily, it looks like only the tests are using any code that doesn't compile with 1.60. Lastly, we need a newer version of the webbrowser rust crate, but it pulls in a lot of unsupported dependencies. I see that we usually include them, but in this case, doing so forces us to update core windows-sys crates, which would cause a rebuild of librsvg :-/ It turned out to be a lot easier to just add a patch to remove android, ios and macos dependencies manually. Thanks, Pierre Pierre Langlois (4): gnu: Add rust-unindent-0.2. gnu: Update rust-tiny-http to 0.12.0. gnu: Add rust-webbrowser-0.8. gnu: tree-sitter-cli: Fix build with 0.20.8 version. gnu/local.mk | 1 + gnu/packages/crates-io.scm | 62 ++++++++++++++++--- ...ust-webbrowser-remove-unsupported-os.patch | 24 +++++++ gnu/packages/tree-sitter.scm | 20 +++++- 4 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch base-commit: 8b855dc1f4a3e31c002c229ad4d91525f4ce97d3