From: Pierre Langlois <pierre.langlois@gmx.com>
To: 63348@debbugs.gnu.org
Cc: Pierre Langlois <pierre.langlois@gmx.com>
Subject: [bug#63348] [PATCH 4/4] gnu: tree-sitter-cli: Fix build with 0.20.8 version.
Date: Sun, 7 May 2023 14:26:22 +0100 [thread overview]
Message-ID: <cfe55dbec7118e24c5bcff341f73988e95fdbeea.1683465958.git.pierre.langlois@gmx.com> (raw)
In-Reply-To: <fc2b158f1da2d8010f99c6ad97e5364294f2f518.1683465958.git.pierre.langlois@gmx.com>
* 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(-)
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"
--
2.39.2
next prev parent reply other threads:[~2023-05-07 13:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-07 13:12 [bug#63348] [PATCH 0/4] Fix tree-sitter-cli build after 0.20.8 update Pierre Langlois
2023-05-07 13:26 ` [bug#63348] [PATCH 1/4] gnu: Add rust-unindent-0.2 Pierre Langlois
2023-05-07 13:26 ` [bug#63348] [PATCH 2/4] gnu: Update rust-tiny-http to 0.12.0 Pierre Langlois
2023-05-07 13:26 ` [bug#63348] [PATCH 3/4] gnu: Add rust-webbrowser-0.8 Pierre Langlois
2023-05-07 13:26 ` Pierre Langlois [this message]
2023-05-07 16:49 ` bug#63348: [PATCH 0/4] Fix tree-sitter-cli build after 0.20.8 update Efraim Flashner
2023-05-07 17:10 ` [bug#63348] " Pierre Langlois
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cfe55dbec7118e24c5bcff341f73988e95fdbeea.1683465958.git.pierre.langlois@gmx.com \
--to=pierre.langlois@gmx.com \
--cc=63348@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.