guix_mirror_bot pushed a commit to branch misc-world-rebuild in repository guix.
commit 86ba2e47f16a8dfce2d0e05a81c4351381da4a79 Author: Nguyễn Gia Phong <[email protected]> AuthorDate: Wed Jul 1 23:38:41 2026 +0900 gnu: rust: Fix compatibility with curl 8.18 and above. Since curl 8.18, the error messages that the Cargo test tries to match have changed from "Couldn't" to "Could not". The upstream fix landed on Cargo 0.97 for Rust 1.96. * gnu/packages/rust.scm (rust)[arguments]<#:phases>: Add phase 'patch-cargo-test-compat-curl-8.18. References: https://github.com/rust-lang/cargo/pull/16698 References: https://github.com/curl/curl/pull/19572 --- gnu/packages/rust.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 1ff579ee6e..e5822eba5b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -2025,6 +2025,14 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc")) (substitute* "src/tools/cargo/tests/testsuite/death.rs" ,@(make-ignore-test-list '("fn ctrl_c_kills_everyone"))))) + (add-after 'unpack 'patch-cargo-test-compat-curl-8.18 + (lambda _ + ;; Fix compatibility with curl 8.18 and above: + ;; https://github.com/rust-lang/cargo/pull/16698 + ;; TODO: remove on Rust 1.96. + (substitute* '("src/tools/cargo/tests/testsuite/artifact_dep.rs" + "src/tools/cargo/tests/testsuite/vendor.rs") + (("Couldn't") "Could[..]t")))) (add-after 'unpack 'adjust-rpath-values ;; This adds %output:out to rpath, allowing us to install utilities in ;; different outputs while reusing the shared libraries.
