From 6d511a53cf790c10677848f797ad3c71a935c913 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Tue, 2 Apr 2019 19:33:21 -0700 Subject: gnu: rust: Update to 1.33.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/rust.scm (rust): Rename to... (rust-1.32): ...this. (rust): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/rust.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust.scm') 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) -- cgit v1.2.3 From 55548cdc6af701bfa3df51139a9cf8fa3a2fcfa5 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 3 Apr 2019 19:00:44 +0200 Subject: gnu: rust: Enable parallel tests starting with 1.26. * gnu/packages/rust.scm (rust-1.26)[arguments]<#:phases>[check]: Enable parallel tests. --- gnu/packages/rust.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 5198fd3328..f3b2d7366b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -724,6 +724,16 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" `(modify-phases ,phases ;; binaryen was replaced with LLD project from LLVM (delete 'dont-build-native) + (replace 'check + (lambda* _ + ;; Enable parallel execution. + (let ((parallel-job-spec + (string-append "-j" (number->string + (min 4 + (parallel-job-count)))))) + (invoke "./x.py" parallel-job-spec "test" "-vv") + (invoke "./x.py" parallel-job-spec "test" + "src/tools/cargo")))) (replace 'remove-unsupported-tests (lambda* _ ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH. -- cgit v1.2.3 From a5c72da46c302511ef77f02ed9725e701ab82687 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 14 Apr 2019 09:54:58 -0700 Subject: gnu: rust: Update to 1.34.0. * gnu/packages/rust.scm (rust): Update to 1.34.0. --- gnu/packages/rust.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index f3b2d7366b..a82fdeb434 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1016,4 +1016,18 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (setenv "RUST_TEST_THREADS" "2") #t))))))))) -(define-public rust rust-1.33) +(define-public rust + (let ((base-rust + (rust-bootstrapped-package rust-1.33 "1.34.0" + "0n8z1wngkxab1rvixqg6w8b727hzpnm9wp9h8iy3mpbrzp7mmj3s" + #:patches '()))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet '(begin + (delete-file-recursively "src/llvm-emscripten") + (delete-file-recursively "src/llvm-project") + (delete-file-recursively "vendor/jemalloc-sys/jemalloc") + #t))))))) -- cgit v1.2.3