[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#33066] [PATCH 2/2] gnu: rust: add rust 1.28 and rust 1.29 packages
From: |
Nikolai Merinov |
Subject: |
[bug#33066] [PATCH 2/2] gnu: rust: add rust 1.28 and rust 1.29 packages |
Date: |
Tue, 16 Oct 2018 02:37:41 +0500 |
* gnu/packages/rust.scm (rust-1.27): rename "rust" to "rust-1.27"
(rust-1.28): Use llvm-6.0 finally. Disable test that broken on x86_64 machines
without "avx". Disable test that required network support.
(rust): Package for rust 1.29.1.
---
gnu/packages/rust.scm | 44 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index cbfbdccf1..d61b431e8 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -773,7 +773,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(("fn no_index_update") "#[ignore]\nfn no_index_update"))
#t)))))))))
-(define-public rust
+(define-public rust-1.27
(let ((base-rust
(rust-bootstrapped-package rust-1.26 "1.27.2"
"0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs"
@@ -795,3 +795,45 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(mkdir-p (assoc-ref outputs "out"))
(mkdir-p (assoc-ref outputs "cargo"))
#t)))))))))
+
+(define-public rust-1.28
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.27 "1.28.0"
+
"11k4rn77bca2rikykkk9fmprrgjswd4x4kaq7fia08vgkir82nhx"
+ #:patches
+ '("rust-coresimd-doctest.patch"
+ "rust-bootstrap-stage0-test.patch"
+
"rust-1.25-accept-more-detailed-gdb-lines.patch"
+
"rust-mdbook-Support-reproducible-builds-by-forcing-window.search.patch"))))
+ (package
+ (inherit base-rust)
+ (inputs
+ ;; Use LLVM 6.0
+ (alist-replace "llvm" (list llvm)
+ (package-inputs base-rust)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'configure 'enable-codegen-tests
+ ;; codegen tests should work fine with llvm 6
+ (lambda* _
+ (substitute* "config.toml"
+ (("codegen-tests = false") ""))
+ #t))
+ (add-after 'patch-tests 'disable-amd64-avx-test
+ ;; This test will fail on x86_64 machines without avx
+ (lambda* _
+ (substitute* "src/test/run-pass/issue-44056.rs"
+ (("only-x86_64") "ignore-test")))))))))))
+
+
+(define-public rust
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.28 "1.29.1"
+
"0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i"
+ #:patches
+
'("rust-1.25-accept-more-detailed-gdb-lines.patch"
+
"rust-mdbook-Support-reproducible-builds-by-forcing-window.search.patch"))))
+ (package
+ (inherit base-rust))))
--
2.19.0
- [bug#33066] [PATCH 0/2] Workaround rust reproducibility issues, Nikolai Merinov, 2018/10/16
- [bug#33066] [PATCH 2/2] gnu: rust: add rust 1.28 and rust 1.29 packages,
Nikolai Merinov <=
- [bug#33066] [PATCH 1/2] gnu: rust: workaround rust 1.25-27 reproducibility issues, Nikolai Merinov, 2018/10/16
- [bug#33066] [PATCH 1/2] gnu: rust: workaround rust 1.25-27 reproducibility issues, Danny Milosavljevic, 2018/10/17
- [bug#33066] [PATCH 1/2] gnu: rust: workaround rust 1.25-27 reproducibility issues, Nikolai Merinov, 2018/10/19
- [bug#33066] [PATCHv3] gnu: rust: workaround rust 1.25-27 reproducibility issues, Nikolai Merinov, 2018/10/19
- [bug#33066] [PATCHv3] gnu: rust: workaround rust 1.25-27 reproducibility issues, Nikolai Merinov, 2018/10/21
- [bug#33066] [PATCHv3] gnu: rust: workaround rust 1.25-27 reproducibility issues, Danny Milosavljevic, 2018/10/24
- [bug#33066] [PATCHv3] gnu: rust: workaround rust 1.25-27 reproducibility issues, Danny Milosavljevic, 2018/10/25
- [bug#33066] [PATCHv3] gnu: rust: workaround rust 1.25-27 reproducibility issues, Nikolai Merinov, 2018/10/26