From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:37227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBVj1-0002Il-11 for guix-patches@gnu.org; Tue, 02 Apr 2019 22:34:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBViz-0000Kq-Vb for guix-patches@gnu.org; Tue, 02 Apr 2019 22:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56634) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hBViz-0000Kl-RB for guix-patches@gnu.org; Tue, 02 Apr 2019 22:34:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hBViz-00011t-Mc for guix-patches@gnu.org; Tue, 02 Apr 2019 22:34:01 -0400 Subject: [bug#35115] [PATCH] gnu: rust: Update to 1.33.0 Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:37123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBViQ-0002Eg-Ch for guix-patches@gnu.org; Tue, 02 Apr 2019 22:33:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBViP-0008VF-5B for guix-patches@gnu.org; Tue, 02 Apr 2019 22:33:26 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:43073) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hBViO-0008Ud-Pw for guix-patches@gnu.org; Tue, 02 Apr 2019 22:33:25 -0400 Received: by mail-pf1-x42d.google.com with SMTP id c8so7341991pfd.10 for ; Tue, 02 Apr 2019 19:33:24 -0700 (PDT) From: Ivan Petkov Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Date: Tue, 2 Apr 2019 19:33:21 -0700 Message-Id: <7396117A-02C0-48D4-A643-56519ED8E608@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35115@debbugs.gnu.org * gnu/packages/rust.scm (rust): Rename to... (rust-1.32): ...this. (rust): New variable. --- gnu/packages/rust.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 63426a12fc..fb045afad4 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -928,7 +928,7 @@ jemalloc =3D \"" jemalloc "/lib/libjemalloc_pic.a" = "\" (("```rust") "```rust,no_run")) #t))))))))) =20 -(define-public rust +(define-public rust-1.32 (let ((base-rust (rust-bootstrapped-package rust-1.31 "1.32.0" "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac" @@ -980,3 +980,28 @@ jemalloc =3D \"" 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))))))))) --=20 2.21.0