summaryrefslogtreecommitdiff
path: root/gnu/packages/rust.scm
diff options
context:
space:
mode:
authorNguyễn Gia Phong <cnx@loang.net>2026-07-01 23:38:41 +0900
committerNguyễn Gia Phong <cnx@loang.net>2026-07-22 12:20:10 +0900
commit4c4ac6b5b60fad7b27cdbdac22b54a1ca5c8c252 (patch)
treec68133a15f82dcbbc8c62c3aacc536f46b24ecd8 /gnu/packages/rust.scm
parent5e4c2c74a92670f78fdded6a9dee0bf9d7ebf16d (diff)
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
Diffstat (limited to 'gnu/packages/rust.scm')
-rw-r--r--gnu/packages/rust.scm8
1 files changed, 8 insertions, 0 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index cd01a01ed2b..dc5df5af41f 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -2027,6 +2027,14 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc"))
2027 (substitute* "src/tools/cargo/tests/testsuite/death.rs" 2027 (substitute* "src/tools/cargo/tests/testsuite/death.rs"
2028 ,@(make-ignore-test-list 2028 ,@(make-ignore-test-list
2029 '("fn ctrl_c_kills_everyone"))))) 2029 '("fn ctrl_c_kills_everyone")))))
2030 (add-after 'unpack 'patch-cargo-test-compat-curl-8.18
2031 (lambda _
2032 ;; Fix compatibility with curl 8.18 and above:
2033 ;; https://github.com/rust-lang/cargo/pull/16698
2034 ;; TODO: remove on Rust 1.96.
2035 (substitute* '("src/tools/cargo/tests/testsuite/artifact_dep.rs"
2036 "src/tools/cargo/tests/testsuite/vendor.rs")
2037 (("Couldn't") "Could[..]t"))))
2030 (add-after 'unpack 'adjust-rpath-values 2038 (add-after 'unpack 'adjust-rpath-values
2031 ;; This adds %output:out to rpath, allowing us to install utilities in 2039 ;; This adds %output:out to rpath, allowing us to install utilities in
2032 ;; different outputs while reusing the shared libraries. 2040 ;; different outputs while reusing the shared libraries.