From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 mI2mJBraV2QuSwAASxT56A (envelope-from ) for ; Sun, 07 May 2023 19:04:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GPeKJBraV2SqTgAAauVa8A (envelope-from ) for ; Sun, 07 May 2023 19:04:26 +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 F207B1B231 for ; Sun, 7 May 2023 19:04:25 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvhaW-0007YB-Uc; Sun, 07 May 2023 12:50:20 -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 1pvhaG-0006W0-Qn for guix-patches@gnu.org; Sun, 07 May 2023 12:50: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 1pvhaE-0002WZ-L7 for guix-patches@gnu.org; Sun, 07 May 2023 12:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvhaE-0005Oj-3X for guix-patches@gnu.org; Sun, 07 May 2023 12:50:02 -0400 Subject: bug#63348: [PATCH 0/4] Fix tree-sitter-cli build after 0.20.8 update. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 16:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 63348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre Langlois Cc: 63348-done@debbugs.gnu.org Received: via spool by 63348-done@debbugs.gnu.org id=D63348.168347818120707 (code D ref 63348); Sun, 07 May 2023 16:50:01 +0000 Received: (at 63348-done) by debbugs.gnu.org; 7 May 2023 16:49:41 +0000 Received: from localhost ([127.0.0.1]:38307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvhZs-0005Nu-JX for submit@debbugs.gnu.org; Sun, 07 May 2023 12:49:40 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:48253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvhZq-0005Nf-Oi for 63348-done@debbugs.gnu.org; Sun, 07 May 2023 12:49:39 -0400 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3f18335a870so22930685e9.0 for <63348-done@debbugs.gnu.org>; Sun, 07 May 2023 09:49:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683478172; x=1686070172; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=SHyBRnB48PRDwDHI9+Oi9TN9qBpQoP2SjiIr5cacWCQ=; b=dPuv3Sys6I2rm8niseXQnxQDanyxlWOIWWaFflRK/4zYVcSLzWUE+umd2ho4yJ7p90 doQuVNQboleV+n3lhnMLkAuEDP6gZ0J44BKmbWLMWHrYKvQ/mo3sN2Otm1+79VSAXyIb oY5xQDYdToBw7efSpGYn1JQ122rd5bam+yLsL+mGU+n4NbJdhUz2XZBlw1QqUnJwvT7W tuKX7cVdaL28xJQSq2skPvwVyHijJ0Oh5XIL7uY9Us8PbvN65m3X51lwOKP7i/cDMHcA fymMlIsjGAz+SM0/ea6CARmSOjmDhtc3hodpMu4XrPRxAbjBmUcBMaKnx7CHh7hzXBly SHpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683478172; x=1686070172; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SHyBRnB48PRDwDHI9+Oi9TN9qBpQoP2SjiIr5cacWCQ=; b=HtMu1E5MMyAjgmQkE7LOoh4/JQwVKWMzApILuxaI3Vfb4FscOD/SzStv4uMOc8v/Q/ hj2fwcLW++xVxftxtHy3ADRpDeZa0TdJFP1nSCg20/toILqIlji98F5xKFpZJN6ocEZa MFyNWOHkj0tqnKSfr+URlBcaBhyPkoIA5YOyOEokMJyHhd3FuKsL2NioCtFVRcdBvFoP ziDDMNjcbsHuvvUEibDrIFmG4QxtB72E242nI4z9a3KUalmjLWeoDxu4M0hMPbCFjUx4 GfBXoMhXDwlYR2INFnep1beWYfxjXRsLHGaesENJtUOWGdqhH/B/TuXe3b79jixXjH4i tNQg== X-Gm-Message-State: AC+VfDzF6qc66TaEug0afRudOJl6GLEcOAXCISpTQE+g4oDUEHlNxX0B C5aXIzBmmyceLbh2k3v7JZk= X-Google-Smtp-Source: ACHHUZ5swtMY+r80kVwFciYKI/+xkIsBtaCNyEGtWg3piMDnw6fcRrPyrmnKJa+f9u5pl8sCajHAYA== X-Received: by 2002:a05:600c:2310:b0:3f3:fe82:ee79 with SMTP id 16-20020a05600c231000b003f3fe82ee79mr5343344wmo.23.1683478171903; Sun, 07 May 2023 09:49:31 -0700 (PDT) Received: from localhost ([2a02:ed3:910:2a00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id q3-20020a1cf303000000b003f3157988f8sm14135229wmq.26.2023.05.07.09.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 May 2023 09:49:31 -0700 (PDT) Date: Sun, 7 May 2023 19:49:29 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Pierre Langlois , 63348-done@debbugs.gnu.org References: <87fs88uvo4.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="dYDU///3LUUFLn+g" Content-Disposition: inline In-Reply-To: <87fs88uvo4.fsf@gmx.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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=1683479066; a=rsa-sha256; cv=none; b=OLw8s6Y8GHQb1SHOonecjN7rDdz7afAcQTCvtuhc/yoV8XToGs+V4V3lkFoDkFD+jmkjRI OWmeIZbyxs3ikKcadfApttswbvCXJ59fQiYDRcB97hvvxkpJjoiTCrkQo96qFpQLJKegST rifXEe6MSq6ORtUETnzU2AIKu+3Jg7LfAsHJpF8OYZY3pl03euJeOzlsiyfaWGgmp6MVxj wPqXMlPF3yZVdcXaNrd61enQn9zyGtd+m4N1xEChCT9/S2BXiub6Vrs5uC/nZ82rMBEfsA tXYS+/lpP25rkqYZUy8BtD7+B/vXjF4WUIkzwK27rEusWvF2K3h/uxgsHJA9zQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=dPuv3Sys; dmarc=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=1683479066; 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-to: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=SHyBRnB48PRDwDHI9+Oi9TN9qBpQoP2SjiIr5cacWCQ=; b=jf5Tlk9qmlj9oRl3pv9vihDG8w4PQG70GaekcXXIlpiPRB3tOCsE70927avFUFHQBHPv6p StG/sxl3IiJKdXNay9fzlMsZO74C9pwaD4QIewXkwj98n4w8l/Qbhll25ClWkXbMxLfees 6PPAUi/lyIrV2c5Z8G/2v6m63WAQvEK93Kx7BxNpWfo71QQaPWYmOXTneKC+k4WDc+OifC YIwVtUU8GAurkpjfG077njogUUNRJdnfWmEPCVxAj5qqEhimoXXI69azpxX9m6pw8itoDc eSt5H6EZd7itOQ4BXMFRQMmQy/HcEnPNoPAgmagm0BDCjUSQ3JXDjB9UCLjgjg== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=dPuv3Sys; dmarc=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: 0.71 X-Spam-Score: 0.71 X-Migadu-Queue-Id: F207B1B231 X-TUID: ez3P7UV5rKSe --dYDU///3LUUFLn+g Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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/commit= s/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 have rust-1.67, so I re-enabled the tests. > 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. > 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! > 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-unsupport= ed-os.patch >=20 >=20 > base-commit: 8b855dc1f4a3e31c002c229ad4d91525f4ce97d3 > --=20 > 2.39.2 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --dYDU///3LUUFLn+g Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmRX1pYACgkQQarn3Mo9 g1GvvA/+LRAwZlWmfyLjaIVJ6jYsJk+FarSlS+7ASRtybqCdpLVxxjpFKnWPjHvI MvAlIhH+sJhUZXvxhTkougR1C6TqoP3TVh78AF6/+iIReVKwlW7jWsQ4KipSPhpR GHKOyLGdwW5pNDYVW/TUw+PyPE8/SIXPuugm3UsvxYV0wLTh+wvYV4j/6z4SlohX Fm9095PZ95YOnVRILqIW/LSRHjiLDcAQTDriRAb0V81bzmdUlPR2WenyYqlykAex H1x49bwMeNBcioqxFpTm2vcDC4dgJEkNkIE5GBiqPiOM7oFNinQZFG6H9A2Tp+PQ /wEP8czqlD9pFyOK7NieGYdTMWyTZAi5o/lMz/2Ld+leFOw16oI5W2r7OHPINkYE BDm52MergmDIsh9nckkxj9Yc6/BaPbW3v+zxeYNzPiNBKB5E/dLwaar1rXGmxhwt CTLzxvLZ+IGM6RTyrNQCS0MZlMLri1P4ombqo1Z6b9mmSrJFci36isreOoBgpI42 PYmPQX2ok6DGVQVLifTChN3gYX+5HfGEuh0yA8I+P4u7UNQQa8vXqr0KrG9ouD3P ZdVkQZNp4Rp3w+npc8AzsGSyZfbSoAwuCl4s+3POyZqwiq6h4sX08bu9kKQAnefB Vbt4X6VvH8DZc6vQb8j2dCQBf9Aed6K7JmGv2IAvhphK8V/I/gU= =isxy -----END PGP SIGNATURE----- --dYDU///3LUUFLn+g--