amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rust: Update to 1.77.0.

Browse source 
* 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>
This commit is contained in:
Brennan Vincent 2024-03-24 10:27:38 -04:00 • committed by Efraim Flashner
parent 7758ad75f5
commit 80f58e508f
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/rust.scm
View file

@ -1027,7 +1027,7 @@ safety and thread safety guarantees.")
;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; Here we take the latest included Rust, make it public, and re-enable tests
;;; and extra components such as rustfmt. ;;; and extra components such as rustfmt.
(define-public rust (define-public rust
(let ((base-rust rust-1.76)) (let ((base-rust rust-1.77))
(package (package
(inherit base-rust) (inherit base-rust)
(properties (append (properties (append
@ -1050,7 +1050,8 @@ safety and thread safety guarantees.")
"vendor/curl-sys-0.4.63+curl-8.1.2/curl" "vendor/curl-sys-0.4.63+curl-8.1.2/curl"
"vendor/libffi-sys/libffi" "vendor/libffi-sys/libffi"
"vendor/libnghttp2-sys/nghttp2" "vendor/libnghttp2-sys/nghttp2"
"vendor/libz-sys/src/zlib")) "vendor/libz-sys/src/zlib"
"vendor/libz-sys-1.1.9/src/zlib"))
;; Use the packaged nghttp2 ;; Use the packaged nghttp2
(delete-file "vendor/libnghttp2-sys/build.rs") (delete-file "vendor/libnghttp2-sys/build.rs")
(with-output-to-file "vendor/libnghttp2-sys/build.rs" (with-output-to-file "vendor/libnghttp2-sys/build.rs"
@ -1195,7 +1196,7 @@ safety and thread safety guarantees.")
;; The three tests which are known to fail upstream on QEMU ;; The three tests which are known to fail upstream on QEMU
;; emulation on aarch64 and riscv64 also fail on x86_64 in ;; emulation on aarch64 and riscv64 also fail on x86_64 in
;; Guix's build system. Skip them on all builds. ;; Guix's build system. Skip them on all builds.
(substitute* "sys/unix/process/process_common/tests.rs" (substitute* "sys/pal/unix/process/process_common/tests.rs"
;; We can't use make-ignore-test-list because we will get ;; We can't use make-ignore-test-list because we will get
;; build errors due to the double [ignore] block. ;; build errors due to the double [ignore] block.
(("target_arch = \"arm\"" arm) (("target_arch = \"arm\"" arm)