summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorBrennan Vincent <brennan@umanwizard.com>2024-08-26 13:40:57 -0400
committerEfraim Flashner <efraim@flashner.co.il>2024-11-28 11:04:18 +0200
commit89d6561de9ffff2b24c74418564c1983c187508a (patch)
tree3d2c26198e758b928102d055cd772c5ac779a69f /gnu
parent31fafd227036cf76f861c5582d828842826af097 (diff)
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>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/rust.scm16
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index e0def663b9a..016ffced532 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1064,7 +1064,7 @@ safety and thread safety guarantees.")
1064;;; Here we take the latest included Rust, make it public, and re-enable tests 1064;;; Here we take the latest included Rust, make it public, and re-enable tests
1065;;; and extra components such as rustfmt. 1065;;; and extra components such as rustfmt.
1066(define-public rust 1066(define-public rust
1067 (let ((base-rust rust-1.79)) 1067 (let ((base-rust rust-1.80))
1068 (package 1068 (package
1069 (inherit base-rust) 1069 (inherit base-rust)
1070 (properties (append 1070 (properties (append
@@ -1079,7 +1079,7 @@ safety and thread safety guarantees.")
1079 (for-each delete-file-recursively 1079 (for-each delete-file-recursively
1080 '("src/llvm-project" 1080 '("src/llvm-project"
1081 "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" 1081 "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc"
1082 "vendor/openssl-src-111.28.1+1.1.1w/openssl" 1082 "vendor/openssl-src-111.28.2+1.1.1w/openssl"
1083 "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" 1083 "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc"
1084 ;; These are referenced by the cargo output 1084 ;; These are referenced by the cargo output
1085 ;; so we unbundle them. 1085 ;; so we unbundle them.
@@ -1100,7 +1100,8 @@ safety and thread safety guarantees.")
1100 (for-each delete-file 1100 (for-each delete-file
1101 (find-files "vendor" "\\.(a|dll|exe|lib)$")) 1101 (find-files "vendor" "\\.(a|dll|exe|lib)$"))
1102 ;; Adjust vendored dependency to explicitly use rustix with libc backend. 1102 ;; Adjust vendored dependency to explicitly use rustix with libc backend.
1103 (substitute* "vendor/tempfile/Cargo.toml" 1103 (substitute* '("vendor/tempfile-3.7.1/Cargo.toml"
1104 "vendor/tempfile-3.10.1/Cargo.toml")
1104 (("features = \\[\"fs\"" all) 1105 (("features = \\[\"fs\"" all)
1105 (string-append all ", \"use-libc\""))))))) 1106 (string-append all ", \"use-libc\"")))))))
1106 (arguments 1107 (arguments
@@ -1210,6 +1211,15 @@ safety and thread safety guarantees.")
1210 (substitute* "src/tools/cargo/tests/testsuite/install.rs" 1211 (substitute* "src/tools/cargo/tests/testsuite/install.rs"
1211 ,@(make-ignore-test-list 1212 ,@(make-ignore-test-list
1212 '("fn install_global_cargo_config"))))) 1213 '("fn install_global_cargo_config")))))
1214 (add-after 'unpack 'disable-miscellaneous-broken-tests
1215 (lambda _
1216 (substitute* "src/tools/cargo/tests/testsuite/check_cfg.rs"
1217 ;; These apparently get confused by the fact that
1218 ;; we're building in a directory containing the
1219 ;; string "rustc"
1220 ,@(make-ignore-test-list
1221 '("fn config_fingerprint"
1222 "fn features_fingerprint")))))
1213 (add-after 'unpack 'patch-command-exec-tests 1223 (add-after 'unpack 'patch-command-exec-tests
1214 ;; This test suite includes some tests that the stdlib's 1224 ;; This test suite includes some tests that the stdlib's
1215 ;; `Command` execution properly handles in situations where 1225 ;; `Command` execution properly handles in situations where