diff options
| author | Brennan Vincent <brennan@umanwizard.com> | 2024-03-24 10:27:38 -0400 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-07-19 00:43:50 +0300 |
| commit | 80f58e508f08e6424d3311f7c958d64fc6adf69a (patch) | |
| tree | c7010bc5d46a4c865df37732956d79fcebe46065 /gnu/packages/rust.scm | |
| parent | 7758ad75f5d76207da700b9ebfbb7e1e85fb4d18 (diff) | |
gnu: rust: Update to 1.77.0.
* gnu/packages/rust.scm (rust): Base main rust package on rust-1.77.
[source]: Remove another vendored copy of zlib.
Change-Id: Ia4611b0ea153bce1de97e711af6d3f7396a6bf85
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index ba3253aa833..53bf4ee5125 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm | |||
| @@ -1027,7 +1027,7 @@ safety and thread safety guarantees.") | |||
| 1027 | ;;; Here we take the latest included Rust, make it public, and re-enable tests | 1027 | ;;; Here we take the latest included Rust, make it public, and re-enable tests |
| 1028 | ;;; and extra components such as rustfmt. | 1028 | ;;; and extra components such as rustfmt. |
| 1029 | (define-public rust | 1029 | (define-public rust |
| 1030 | (let ((base-rust rust-1.76)) | 1030 | (let ((base-rust rust-1.77)) |
| 1031 | (package | 1031 | (package |
| 1032 | (inherit base-rust) | 1032 | (inherit base-rust) |
| 1033 | (properties (append | 1033 | (properties (append |
| @@ -1050,7 +1050,8 @@ safety and thread safety guarantees.") | |||
| 1050 | "vendor/curl-sys-0.4.63+curl-8.1.2/curl" | 1050 | "vendor/curl-sys-0.4.63+curl-8.1.2/curl" |
| 1051 | "vendor/libffi-sys/libffi" | 1051 | "vendor/libffi-sys/libffi" |
| 1052 | "vendor/libnghttp2-sys/nghttp2" | 1052 | "vendor/libnghttp2-sys/nghttp2" |
| 1053 | "vendor/libz-sys/src/zlib")) | 1053 | "vendor/libz-sys/src/zlib" |
| 1054 | "vendor/libz-sys-1.1.9/src/zlib")) | ||
| 1054 | ;; Use the packaged nghttp2 | 1055 | ;; Use the packaged nghttp2 |
| 1055 | (delete-file "vendor/libnghttp2-sys/build.rs") | 1056 | (delete-file "vendor/libnghttp2-sys/build.rs") |
| 1056 | (with-output-to-file "vendor/libnghttp2-sys/build.rs" | 1057 | (with-output-to-file "vendor/libnghttp2-sys/build.rs" |
| @@ -1195,7 +1196,7 @@ safety and thread safety guarantees.") | |||
| 1195 | ;; The three tests which are known to fail upstream on QEMU | 1196 | ;; The three tests which are known to fail upstream on QEMU |
| 1196 | ;; emulation on aarch64 and riscv64 also fail on x86_64 in | 1197 | ;; emulation on aarch64 and riscv64 also fail on x86_64 in |
| 1197 | ;; Guix's build system. Skip them on all builds. | 1198 | ;; Guix's build system. Skip them on all builds. |
| 1198 | (substitute* "sys/unix/process/process_common/tests.rs" | 1199 | (substitute* "sys/pal/unix/process/process_common/tests.rs" |
| 1199 | ;; We can't use make-ignore-test-list because we will get | 1200 | ;; We can't use make-ignore-test-list because we will get |
| 1200 | ;; build errors due to the double [ignore] block. | 1201 | ;; build errors due to the double [ignore] block. |
| 1201 | (("target_arch = \"arm\"" arm) | 1202 | (("target_arch = \"arm\"" arm) |
