From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 8MQZGCXdV2REDgAASxT56A (envelope-from ) for ; Sun, 07 May 2023 19:17:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OKgHGCXdV2T+QQEA9RJhRA (envelope-from ) for ; Sun, 07 May 2023 19:17:25 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2C9C61B6C5 for ; Sun, 7 May 2023 19:17:25 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvi0S-0007Fq-4D; Sun, 07 May 2023 13:17:08 -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 1pvi0M-0007C9-Ky for guix-patches@gnu.org; Sun, 07 May 2023 13:17: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 1pvi0L-0002Fj-VI for guix-patches@gnu.org; Sun, 07 May 2023 13:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvi0L-00069h-Pa for guix-patches@gnu.org; Sun, 07 May 2023 13:17: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 17:17:01 +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: Efraim Flashner Cc: Pierre Langlois , 63348-done@debbugs.gnu.org Received: via spool by 63348-done@debbugs.gnu.org id=D63348.168347977923588 (code D ref 63348); Sun, 07 May 2023 17:17:01 +0000 Received: (at 63348-done) by debbugs.gnu.org; 7 May 2023 17:16:19 +0000 Received: from localhost ([127.0.0.1]:38349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvhze-00068N-SW for submit@debbugs.gnu.org; Sun, 07 May 2023 13:16:19 -0400 Received: from mout.gmx.net ([212.227.17.20]:60979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvhzc-00068A-UB for 63348-done@debbugs.gnu.org; Sun, 07 May 2023 13:16:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.com; s=s31663417; t=1683479740; i=pierre.langlois@gmx.com; bh=FcHFNb1U4Twgvt1q85cLNb2wnGEa9mF1goFu0A//mM0=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=OCBYC7hqZdS3o1jMkpxNF+7DPPzS4W8qDmcCdKZ83AyyuOZEmPUt632mdIsIB2oZU twTDGarYdsSSalZPbXY7h1Rqh5HD4GahsLOpnrz1qcp0cy4scdMwjPHzUWeg1Kj8cX Do/sAQr+qs6vDwQDQ64uFqg+Pum8nOt8h/C1Sj2lDbGXhr6jt4hg1GGbg/6TKtqvIN iNOaKYAR4YpC3DMRfjJFlFhNMQB+NSZJNF19BhPaOuHHWeXPrJaMEAV3vLo064bBhC jOE96CRl468L73GWLmGVNeiyLj/ZywHH8/u5VPLykOgFCjdzYrPfUQrEWeq4Oz8kSm ef4uFyYlwzZwA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1M8ygY-1ppdhl48wA-00649j; Sun, 07 May 2023 19:15:40 +0200 References: <87fs88uvo4.fsf@gmx.com> User-agent: mu4e 1.10.2; emacs 28.2 From: Pierre Langlois Date: Sun, 07 May 2023 18:10:39 +0100 In-reply-to: Message-ID: <87r0rst64m.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:qS3aTr8JeZ6pPqjXSkrqHorAHU1fR+aFDYPIEnvAiHsDjJWGhUC EfK+lPWEiWsVva4nAFql1FvEUsgEGcpynPhipXG85VZE6zwEKLcMdJaIpeBcMwhbnFONcin UIGCLBc9IdKMwq7C9jt8EZWlp9E7uG4Kz39CrbqgywfXIEYkWcTl5N7yppFWo0DrjT3EHTo sw2iF6n3QAyQJIpwMn13Q== UI-OutboundReport: notjunk:1;M01:P0:GBlbW9Jq0Vw=;jwsnwfNIcdI6VcKs7RWpy5RmXU4 IauxALGVGVaSFKuETlXnMeKFx/lw9hMvJa31cr3m84YLozJEBwuIV8JydTKrryEdC2FZhs5hP 3nFM3pjdDzYP/JbNXgVSNu8eW6i5zaJ13VXypkijnJWycZ/6j0sY1oqAeFBAvucxO8sRvJ1zc 53Ytow/UHN2YOTOv1sFWQpszDSbZXHsKfNqUqnpTDKNEpd9y5V+S1iB3QMxPbNXqY43x5A5zk dlmzsNrpO5sEXGBUJEufhJe04+pT6Jgb2hM6UFofDJ+Epf0tO1DlaisYPAZrvQnV+Shql+5mi E+LZIB4Y8nnoH3O1/ddkxu6NgKMuGKyM7WXMWcR1ngtvlsUgFqjyIo9JhN+2Vfst88yW3a49O LZV6cyvePFTO+FsQo7V4ivbG3VUP8BQnOvdwqUyzCruDQpCVYrlX7rMgSqUFdPNvILweQLQp1 RXFOKJ4lXyHDj4Invzn7XN2QZxw74yd6s7aYCTcp+CAdGbKFKM/1RmPdyRYCRZUKbBlOqzBtw goTz+UwqKiQ8Y8qWEJK/cgzkhc023B+51iUgv/XvCoohlTdBkUNsPCeiazvE2oOJ9/pONJ9Hs p/Q2bclatypASIUPb/Pl2u+UW3YwV0YLoSfeRErp3JQZFIO69bGbjhMMLD4owN9A61gEACCK2 70zw9ueHwRgslsCS4E9yO3jQU0pk7v0UUQIOUXgXvz/X2ed/RA0UjBXM322Bp/ufcC3j4RlNc eKZnbyL07CGqwMgPlNnwU8oRXIVWWwzgeJEZQCufzlxstdSP2rRB+TJESHzi3gCOMVOe1UxcA UPxBDAfV6eZffwpjBo0V8E7kpfNhcPh2FjuUN6Or61Gid6PBsPAJQgELQBZ1JyZA0PeLjcTbv e4+Cj5zB5YW+0q65z21fKX3P49BYgKWNqdrLh7NtwykqGEBlNExzeLoXaHNS13vcCjyMyEoFl aUexqUVaOQNDULv7JDWlNWjLAYs= 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683479845; a=rsa-sha256; cv=none; b=s2vp9aDKc3ck3FDEIpJxWIqzNGLge1okzkFwoqZmxz6q7xlqbpYXX15Ec6RejcOj8sgc/k 61qGrxorWxvoHzmDkLSqPNj7xbNkwx+zBcWTMIHLfVcrZfSXMpX5vN2kgoHlYDk0zuDWuj rxK4A/88ARCEn9YCsh96fTvv/zzCIMUZINmnlV2v3UEVgrtCPhHI/OS47HRA5aRWqSzO9P 5GwqwDemNYyTh3bJ64ydu4+jG8Uw4p+nEjsuLTNwu1zfZGj+SsekVz6fwmiyH41iCZvxOu GsuBj5tOMmThltTUBbDCRqfka0EjCog94pNZY7DDJKfDJ6WH7pBkUz91feJqYw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.com header.s=s31663417 header.b=OCBYC7hq; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683479845; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=pfz6ZQ9Wa/0QS0exuFHztjEsSRpH5zZuSMN7Bkvb9OQ=; b=PfgIP0QZdVpxhnAcQKDFj1S1Oo3HmgasEG6isQt12jKacZpgKvB9R01VLNuomQzyUHpwLD EEQIPnAjygzS+0EWWZIHFZsFUUm90lWHJ9cn/Kg+UkITwOgOg5V2L7HSKdHVQ21vOxKL7C ZhkEmlEJDbRQ0rsXqa8fOzqIITDd+bgVrl6cJVKdBnmtWS9dJMn3xegGoxgxLtDVsAs1T2 PGjb974IzbJLKCFYG5Zl7N5m7VmkoQamiXt8ZDNdNe6unA6vpGaQ68oC5QmK/PNwuxug1D 2FwF98TM2LJu+fHVWZYTdrEuI/Jlb6aD0/K69qT5+5I1DqoR49WDHTHEYL0VyQ== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.com header.s=s31663417 header.b=OCBYC7hq; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.11 X-Spam-Score: 5.11 X-Migadu-Queue-Id: 2C9C61B6C5 X-TUID: cwfBBedhsjFy --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Efraim Flashner writes: > [[PGP Signed Part:Undecided]] > On Sun, May 07, 2023 at 02:12:02PM +0100, Pierre Langlois wrote: >> Hi Guix and rust-team! >>=20 >> 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! >>=20 >> 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/commi= ts/da894afef59e1aefa23470c7db7445096f8f0e65 >> However, luckily, it looks like only the tests are using any code that >> doesn't compile with 1.60. > > On the rust-team branch, which we hope to merge Real Soon=E2=84=A2, we ha= ve > rust-1.67, so I re-enabled the tests. Oh happy that it just worked! I was thinking of trying it on the rust-team branch, but didn't get to yet. > >> 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 :-/ > > I went to remove the patch and add in the packages, but even after all > the patches on the rust-team branch we don't have rust-jni-0.21 (at > least) so I punted and put your patch back in :) > >> It turned out to be a lot easier to just add a patch to remove android, >> ios and macos dependencies manually. > > Indeed! I wonder about doing that with other packages which use them. Oh yeah, doing this made me wonder if we couldn't do this automatically, and rewrite cargo.toml files in the build system, to drop many packages like that. I wonder how well that would work. > >> Thanks, >> Pierre >>=20 >> Pierre Langlois (4): >> gnu: Add rust-unindent-0.2. > > I ended up dropping this patch since it was already in effect on the > rust-team branch. > >> 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. > > These 3 went in though. Thanks! Nice, thank you! Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmRX3LkYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UuO4IAJr/n0mJKoimPhsYnd/cs9oi padk38mRbexZoMeBHgps2ExHDeRSOBkin3hiW27NVFEKMzf6QDzfYtrDfoDub9mq QUPydy6Wkycaf0NszaoAiolz1aaEnrju5BJTNPBitDKbgEXTDmvR2+qTN4utb4pu /Q+Sw3lDtI28NXStk4Uh7BbOFqB0Ju9MpSNrSBR6LXyT153qWQDkhHnfm57tipkI XZJYpPOY63aJoJOAvmsj8dDKhVkNVdLQtldfnqCFYUYCfLN3y4380IaScSRBQLGb 3AYGQNsm/6/agkvpAkF4B2/x8QLQBBZC7uSWqVk9nMFEJBRiOx43HKw5n6naSqw= =E5H5 -----END PGP SIGNATURE----- --=-=-=--