me
/
guix
Archived
1
0
Fork 0
Code

gnu: rust: Update to 1.24.0. 

* gnu/packages/rust.scm (rust): Rename to...
(rust-1.24): ...this.
(rust): New variable.
master
Nikolai Merinov 2018-04-15 10:11:37 +02:00 committed by Danny Milosavljevic
parent 1bb23335e6
commit fe61c88af9
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/rust.scm
View File

@ -362,7 +362,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
`("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib"))))
#t)))))))))
(define-public rust
(define-public rust-1.24
(let ((base-rust
(rust-bootstrapped-package rust-1.23 "1.24.1"
"1vv10x2h9kq7fxh2v01damdq8pvlp5acyh1kzcda9sfjx12kv99y")))
@ -373,3 +373,25 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
((#:phases phases)
`(modify-phases ,phases
(delete 'fix-mtime-bug))))))))
(define-public rust
(let ((base-rust rust-1.24))
(package
(inherit base-rust)
(version "1.25.0")
(source
(rust-source version
"0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf"))
(native-inputs
(alist-replace "cargo-bootstrap" (list base-rust "cargo")
(alist-replace "rustc-bootstrap" (list base-rust)
(package-native-inputs base-rust))))
(arguments
(substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases)
`(modify-phases ,phases
(add-after 'patch-cargo-tests 'patch-cargo-index-update
(lambda* _
(substitute* "src/tools/cargo/tests/generate-lockfile.rs"
;; This test wants to update the crate index.
(("fn no_index_update") "#[ignore]\nfn no_index_update")))))))))))