[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: rust: Update to 1.24.0.
From: |
Danny Milosavljevic |
Subject: |
02/06: gnu: rust: Update to 1.24.0. |
Date: |
Mon, 16 Apr 2018 13:59:52 -0400 (EDT) |
dannym pushed a commit to branch master
in repository guix.
commit fe61c88af93a230bee9aebb9c6c3836d153a4e0f
Author: Nikolai Merinov <address@hidden>
Date: Sun Apr 15 10:11:37 2018 +0200
gnu: rust: Update to 1.24.0.
* gnu/packages/rust.scm (rust): Rename to...
(rust-1.24): ...this.
(rust): New variable.
---
gnu/packages/rust.scm | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 1112d08..d95577e 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -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")))))))))))
- branch master updated (eb357e2 -> 237587f), Danny Milosavljevic, 2018/04/16
- 05/06: gnu: rust: Don't build for "native" arch on ARM., Danny Milosavljevic, 2018/04/16
- 06/06: gnu: rust: Disable test_process_mask tests., Danny Milosavljevic, 2018/04/16
- 03/06: gnu: Add mrustc., Danny Milosavljevic, 2018/04/16
- 01/06: gnu: rust: Enable more tests., Danny Milosavljevic, 2018/04/16
- 04/06: gnu: rust: Don't #ignore the same test twice., Danny Milosavljevic, 2018/04/16
- 02/06: gnu: rust: Update to 1.24.0.,
Danny Milosavljevic <=