From patchwork Wed Apr 29 16:02:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 21759 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 6879F27BBE4; Wed, 29 Apr 2020 17:08:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 370D327BBE1 for ; Wed, 29 Apr 2020 17:08:50 +0100 (BST) Received: from localhost ([::1]:41202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTpGT-0006hf-KS for patchwork@mira.cbaines.net; Wed, 29 Apr 2020 12:08:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41120) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTpAv-0000uB-3S for guix-patches@gnu.org; Wed, 29 Apr 2020 12:03:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTpAt-000683-4P for guix-patches@gnu.org; Wed, 29 Apr 2020 12:03:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTpAs-00067q-N5 for guix-patches@gnu.org; Wed, 29 Apr 2020 12:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTpAs-0003sR-J4 for guix-patches@gnu.org; Wed, 29 Apr 2020 12:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40957] [PATCH 2/?] gnu: rust: Add 1.41 References: <20200429094022.22294-1-kuba@kadziolka.net> In-Reply-To: <20200429094022.22294-1-kuba@kadziolka.net> Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Apr 2020 16:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40957 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40957@debbugs.gnu.org Received: via spool by 40957-submit@debbugs.gnu.org id=B40957.158817614914678 (code B ref 40957); Wed, 29 Apr 2020 16:03:02 +0000 Received: (at 40957) by debbugs.gnu.org; 29 Apr 2020 16:02:29 +0000 Received: from localhost ([127.0.0.1]:44377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTpAK-0003oV-JY for submit@debbugs.gnu.org; Wed, 29 Apr 2020 12:02:28 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:50998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTpAI-0003mM-Hi for 40957@debbugs.gnu.org; Wed, 29 Apr 2020 12:02:27 -0400 Received: (qmail 23529 invoked by uid 1009); 29 Apr 2020 18:02:24 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25796. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.009014 secs); 29 Apr 2020 16:02:24 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 29 Apr 2020 18:02:24 +0200 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Wed, 29 Apr 2020 18:02:18 +0200 Message-Id: <20200429160218.15270-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Qmailux-2.08st: added fake Content-Type header X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a82bfa5912..78cfdfc97a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1210,4 +1210,37 @@ move around." ;; "Remove painful test that is not pulling its weight" (delete 'remove-unsupported-tests))))))))) +(define-public rust-1.41 + (let ((base-rust + (rust-bootstrapped-package rust-1.40 "1.41.1" + "0ws5x0fxv57fyllsa6025h3q6j9v3m8nb3syl4x0hgkddq0kvj9q"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:validate-runpath? _) #t) + ((#:phases phases) + `(modify-phases ,phases + ;; The tests got moved. + (replace 'patch-command-exec-tests + ,(patch-command-exec-tests-phase + "src/test/ui/command/command-exec.rs")) + (replace 'patch-command-uid-gid-test + (lambda _ + (substitute* "src/test/ui/command/command-uid-gid.rs" + (("/bin/sh") (which "sh")) + (("ignore-sgx") "ignore-sgx\n// ignore-tidy-linelength")) + #t)) + ;; The test in question got fixed long ago, no need to chase it + ;; after renames. + (delete 'disable-cargo-test-for-nightly-channel) + ;; The patch-tests phase in rust-1.19 uses the fragile approach + ;; of inserting additional newlines instead of disabling the tidy + ;; check. Fixing this retroactively requires painful rebuilds. + (add-after 'patch-tests 'ignore-tidy-linelength + (lambda _ + (let ((port (open-file "src/libstd/process.rs" "a"))) + (display "// ignore-tidy-linelength\n" port)) + #t))))))))) + (define-public rust rust-1.37)