From patchwork Wed Apr 3 02:33:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Petkov X-Patchwork-Id: 3186 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7E6CD16E1A; Wed, 3 Apr 2019 03:34:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E90F116E19 for ; Wed, 3 Apr 2019 03:34:11 +0100 (BST) Received: from localhost ([127.0.0.1]:58971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBVj9-0002Lw-71 for patchwork@mira.cbaines.net; Tue, 02 Apr 2019 22:34:11 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35115] [PATCH] gnu: rust: Update to 1.33.0 Resent-From: Ivan Petkov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2019 02:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35115 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35115@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15542588143904 (code B ref -1); Wed, 03 Apr 2019 02:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2019 02:33:34 +0000 Received: from localhost ([127.0.0.1]:41945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hBViY-00010u-G7 for submit@debbugs.gnu.org; Tue, 02 Apr 2019 22:33:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hBViW-00010g-Qa for submit@debbugs.gnu.org; Tue, 02 Apr 2019 22:33:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:45889) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hBViR-0008WP-Ja for submit@debbugs.gnu.org; Tue, 02 Apr 2019 22:33:27 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:content-transfer-encoding:mime-version:date:subject:cc:to :message-id; bh=rSqE3zJFyIyCEaXAi7mm5aadarVuDfqvMuPjdyf71i8=; b=oHLcf6cn4hRJPkjrpGeWLsSSWGlLZhm3wGeNc9CEP3wclHiqFT90bNRqdFFlZ+7GOB NFZnIet0XyihjpslR3jdfaoULhp0QmHrdAHaXwvdlj2LYiLfcb1+khdPTSbeL8QHfpYW lbTZMr0ejJ10JOvr5nazv7EmQ++EdDwJqo94HttavRiTJF/H/4E+VJ4btgyt9r1XF4MV 0YVrtZA/hLulAZZjdLGmsTgEv6ziAbYklgdRpBYQguHLEypjlGgLE4ghwFfF4Pjj0lsT qMkqNayXgW00QijCyrUJOdrIoS8pHYcomufKfntgSP1y1E5C1bkEuqh2glNSWJeiacq/ QXBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version:date :subject:cc:to:message-id; bh=rSqE3zJFyIyCEaXAi7mm5aadarVuDfqvMuPjdyf71i8=; b=JrBCrpzUD2KgxB8BWFHgpu2yq1n0oKuRPFh9S6Wgp38Z3nCGlny7kZGDBa76LgRiiv gZhura3ZfbCrRoChTVINYx68fIblykNI/s1dzM9JpsCiAa6HUerqZgFduR4gChGkC0lc iIK4L04LIChw/NX2NtTO5wG92DH3/R23wcHCWJVRiEkomNij9bydPMCapLBaSDLAAznR RP4uWNHu8+XMtpK/gEkxa9HCtMLB22Psrea7O0qo3dFPJmeM6tHljNTJX0AVCHlgMYNU RtdHyeME5oY8awmZw5vnOAtyvZg27cC1E8VBrJBJPyIebRlrJdmLm6jukNrUQRtWbg05 poaw== X-Gm-Message-State: APjAAAUK6LaS8Tw1O9Zdi1rWQEw1wPmguc7FWy4x2eq5Y0jGOKkMnbkw W1sJ6G6Uz6KqUC/6cJxZUsC/PZ6x X-Google-Smtp-Source: APXvYqz4p1MDQ4aZMhDQz5/CgLqT/9uSSRuWuQnC8dPPVX9EED7PuS1Evx8tVo+vzFfXh6w+MO3FkQ== X-Received: by 2002:a63:1247:: with SMTP id 7mr65205765pgs.352.1554258803354; Tue, 02 Apr 2019 19:33:23 -0700 (PDT) Received: from ?IPv6:2601:602:9a00:1784:d9ab:fc5c:426e:1c71? ([2601:602:9a00:1784:d9ab:fc5c:426e:1c71]) by smtp.gmail.com with ESMTPSA id c18sm43496465pfc.0.2019.04.02.19.33.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 19:33:22 -0700 (PDT) From: Ivan Petkov 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> X-Mailer: Apple Mail (2.3445.9.1) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 = \"" 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,28 @@ 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)))))))))