guix_mirror_bot pushed a commit to branch rust-team
in repository guix.

commit aa03ba89d9de77cc3e7e9994066dc7e72128428e
Author: Efraim Flashner <[email protected]>
AuthorDate: Tue Mar 31 16:35:24 2026 +0300

    gnu: rust: Update to 1.94.
    
    * gnu/packages/rust.scm (rust): Update to 1.94.
    [arguments]: Add a phase to patch more files for the test suite. Adjust
    the 'dont-reference-previous-cargo-version phase for changes in the
    source.
    
    Change-Id: I965e8b3b4046322820be632d01926331fc9afc38
---
 gnu/packages/rust.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index a86c53fef6..2b560afeec 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1930,7 +1930,7 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc"))
 ;;; Here we take the latest included Rust, make it public, and re-enable tests
 ;;; and extra components such as rustfmt.
 (define-public rust
-  (let ((base-rust rust-1.93))
+  (let ((base-rust rust-1.94))
     (package
       (inherit base-rust)
       (properties (append
@@ -1951,6 +1951,17 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc"))
           (cons '(srfi srfi-26) modules))
          ((#:phases phases)
           `(modify-phases ,phases
+             (add-after 'unpack 'patch-shebangs-in-tests
+               (lambda* (#:key inputs #:allow-other-keys)
+                 (with-directory-excursion
+                   "src/tools/rust-analyzer/crates/parser/test_data"
+                   (substitute* '("lexer/ok/shebang_frontmatter.rast"
+                                  "parser/inline/ok/frontmatter.rast")
+                     (("/usr/bin/env cargo")
+                      (search-input-file inputs "bin/cargo")))
+                   (substitute* "lexer/ok/single_line_comments.rast"
+                     (("/usr/bin/env bash")
+                      (search-input-file inputs "bin/bash"))))))
              (add-after 'unpack 'disable-tests-requiring-git
                (lambda _
                  (substitute* 
"src/tools/cargo/tests/testsuite/publish_lockfile.rs"
@@ -2163,7 +2174,7 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc"))
                  (with-directory-excursion
                    (string-append (assoc-ref outputs "rust-src")
                                   "/lib/rustlib/src/rust/src/tools/")
-                   (substitute* (find-files "." "\\.rs$")
+                   (substitute* (find-files "." "\\.(rs|rast)$")
                      (("#!.*/bin/cargo")
                       (string-append "#!" (assoc-ref outputs "cargo")
                                      "/bin/cargo"))))))

Reply via email to