me
/
guix
Archived
1
0
Fork 0

gnu: rust: Use rust-1.57.0.

* gnu/packages/rust.scm (rust-1.54): Make it a private variable.  Move
definition to...
(rust-1.57): ... here.
(rust-1.55, rust-1.56): Make private.
* gnu/packages/shells.scm (nushell)[rust]: Remove argument.
master
Maxim Cournoyer 2021-12-28 00:15:01 -05:00
parent c292cf21f7
commit d90080db54
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
2 changed files with 21 additions and 19 deletions

View File

@ -623,14 +623,29 @@ safety and thread safety guarantees.")
(define rust-1.54 (define rust-1.54
(let ((base-rust (let ((base-rust
(rust-bootstrapped-package (rust-bootstrapped-package
rust-1.53 "1.54.0" rust-1.53
"0xk9dhfff16caambmwij67zgshd8v9djw6ha0fnnanlv7rii31dc"))) "1.54.0" "0xk9dhfff16caambmwij67zgshd8v9djw6ha0fnnanlv7rii31dc")))
(package (package/inherit base-rust
(inherit base-rust)
(source (source
(origin (origin
(inherit (package-source base-rust)) (inherit (package-source base-rust))
(snippet '(delete-file-recursively "src/llvm-project")))) (snippet '(delete-file-recursively "src/llvm-project")))))))
(define rust-1.55
(rust-bootstrapped-package
rust-1.54 "1.55.0" "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj"))
(define rust-1.56
(rust-bootstrapped-package
rust-1.55 "1.56.1" "04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3"))
(define rust-1.57
(let ((base-rust
(rust-bootstrapped-package
rust-1.56 "1.57.0"
"06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim")))
(package
(inherit base-rust)
(outputs (cons "rustfmt" (package-outputs base-rust))) (outputs (cons "rustfmt" (package-outputs base-rust)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base-rust) (substitute-keyword-arguments (package-arguments base-rust)
@ -772,20 +787,8 @@ safety and thread safety guarantees.")
`("procps" ,procps) `("procps" ,procps)
(package-native-inputs base-rust)))))) (package-native-inputs base-rust))))))
(define-public rust-1.55
(rust-bootstrapped-package
rust-1.54 "1.55.0" "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj"))
(define-public rust-1.56
(rust-bootstrapped-package
rust-1.55 "1.56.1" "04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3"))
(define-public rust-1.57
(rust-bootstrapped-package
rust-1.56 "1.57.0" "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim"))
;;; Note: Only the latest versions of Rust are supported and tested. The ;;; Note: Only the latest versions of Rust are supported and tested. The
;;; intermediate rusts are built for bootstrapping purposes and should not ;;; intermediate rusts are built for bootstrapping purposes and should not
;;; be relied upon. This is to ease maintenance and reduce the time ;;; be relied upon. This is to ease maintenance and reduce the time
;;; required to build the full Rust bootstrap chain. ;;; required to build the full Rust bootstrap chain.
(define-public rust rust-1.54) (define-public rust rust-1.57)

View File

@ -952,7 +952,6 @@ files and text.")
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:tests? #false ;missing files `(#:tests? #false ;missing files
#:rust ,rust-1.56
#:features '("extra") #:features '("extra")
#:cargo-inputs #:cargo-inputs
(("rust-ctrlc" ,rust-ctrlc-3) (("rust-ctrlc" ,rust-ctrlc-3)