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"