[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#72821] [PATCH 4/4] gnu: rust: update to 1.80
From: |
brennan |
Subject: |
[bug#72821] [PATCH 4/4] gnu: rust: update to 1.80 |
Date: |
Mon, 26 Aug 2024 13:40:57 -0400 |
From: Brennan Vincent <brennan@umanwizard.com>
gnu/packages/rust.scm (rust): update to 1.80.
Change-Id: Ife65cb52362a30df8aabd4255a3fdc3c3d60e7bb
---
gnu/packages/rust.scm | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 0d3a11b696..f73dad2f00 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1061,7 +1061,7 @@ (define (make-ignore-test-list strs)
;;; 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.79))
+ (let ((base-rust rust-1.80))
(package
(inherit base-rust)
(properties (append
@@ -1076,7 +1076,7 @@ (define-public rust
(for-each delete-file-recursively
'("src/llvm-project"
"vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc"
- "vendor/openssl-src-111.28.1+1.1.1w/openssl"
+ "vendor/openssl-src-111.28.2+1.1.1w/openssl"
"vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc"
;; These are referenced by the cargo output
;; so we unbundle them.
@@ -1211,6 +1211,15 @@ (define-public rust
(substitute* "src/tools/cargo/tests/testsuite/install.rs"
,@(make-ignore-test-list
'("fn install_global_cargo_config")))))
+ (add-after 'unpack 'disable-miscellaneous-broken-tests
+ (lambda _
+ (substitute* "src/tools/cargo/tests/testsuite/check_cfg.rs"
+ ;; These apparently get confused by the fact that
+ ;; we're building in a directory containing the
+ ;; string "rustc"
+ ,@(make-ignore-test-list
+ '("fn config_fingerprint"
+ "fn features_fingerprint")))))
(add-after 'unpack 'patch-command-exec-tests
;; This test suite includes some tests that the stdlib's
;; `Command` execution properly handles in situations where
--
2.45.2