aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/rust.scm
diff options
context:
space:
mode:
authorIvan Petkov <ivanppetkov@gmail.com>2019-04-02 19:33:21 -0700
committerLudovic Courtès <ludo@gnu.org>2019-04-11 13:46:39 +0200
commit6d511a53cf790c10677848f797ad3c71a935c913 (patch)
treeaf44d287f9c6880506434bafcd1a6295b27abea7 /gnu/packages/rust.scm
parent02394462fcddd4fdaf354178160adc54c47de1bc (diff)
downloadguix-6d511a53cf790c10677848f797ad3c71a935c913.tar
guix-6d511a53cf790c10677848f797ad3c71a935c913.tar.gz
gnu: rust: Update to 1.33.0
* gnu/packages/rust.scm (rust): Rename to... (rust-1.32): ...this. (rust): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/rust.scm')
-rw-r--r--gnu/packages/rust.scm29
1 files changed, 28 insertions, 1 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 63426a12fc..5198fd3328 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -928,7 +928,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(("```rust") "```rust,no_run"))
#t)))))))))
-(define-public rust
+(define-public rust-1.32
(let ((base-rust
(rust-bootstrapped-package rust-1.31 "1.32.0"
"0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"
@@ -980,3 +980,30 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
;; Remove no longer relevant steps
(delete 'remove-flaky-test)
(delete 'patch-aarch64-test))))))))
+
+(define-public rust-1.33
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.32 "1.33.0"
+ "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as"
+ #:patches '())))
+ (package
+ (inherit base-rust)
+ (inputs
+ ;; Upgrade to jemalloc@5.1.0
+ (alist-replace "jemalloc" (list jemalloc)
+ (package-inputs base-rust)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'ignore-cargo-package-tests)
+ (add-after 'configure 'configure-test-threads
+ ;; Several rustc and cargo tests will fail if run on one core
+ ;; https://github.com/rust-lang/rust/issues/59122
+ ;; https://github.com/rust-lang/cargo/issues/6746
+ ;; https://github.com/rust-lang/rust/issues/58907
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "RUST_TEST_THREADS" "2")
+ #t)))))))))
+
+(define-public rust rust-1.33)