mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-01 15:26:47 +01:00
gnu: rust: Update to 1.80.
gnu/packages/rust.scm (rust): Update to 1.80. Change-Id: Ife65cb52362a30df8aabd4255a3fdc3c3d60e7bb Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
parent
31fafd2270
commit
89d6561de9
1 changed files with 13 additions and 3 deletions
|
@ -1064,7 +1064,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
|
||||
|
@ -1079,7 +1079,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.
|
||||
|
@ -1100,7 +1100,8 @@ (define-public rust
|
|||
(for-each delete-file
|
||||
(find-files "vendor" "\\.(a|dll|exe|lib)$"))
|
||||
;; Adjust vendored dependency to explicitly use rustix with libc backend.
|
||||
(substitute* "vendor/tempfile/Cargo.toml"
|
||||
(substitute* '("vendor/tempfile-3.7.1/Cargo.toml"
|
||||
"vendor/tempfile-3.10.1/Cargo.toml")
|
||||
(("features = \\[\"fs\"" all)
|
||||
(string-append all ", \"use-libc\"")))))))
|
||||
(arguments
|
||||
|
@ -1210,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
|
||||
|
|
Loading…
Reference in a new issue