From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QEokH3umqV4+UQAA0tVLHw (envelope-from ) for ; Wed, 29 Apr 2020 16:08:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UOCdJ4SmqV5pMQAAbx9fmQ (envelope-from ) for ; Wed, 29 Apr 2020 16:08:36 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 20E9694017B for ; Wed, 29 Apr 2020 16:08:35 +0000 (UTC) Received: from localhost ([::1]:41202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTpGF-0006hf-1U for larch@yhetil.org; Wed, 29 Apr 2020 12:08:35 -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?Q?K=C4=85dzio=C5=82ka?= 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?Q?K=C4=85dzio=C5=82ka?= 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 Content-Transfer-Encoding: 8bit X-Qmailux-2.08st: added fake Content-Type header Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: 3.49 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [3.49 / 13.00]; GENERIC_REPUTATION(0.00)[-0.49347712020919]; DWL_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; R_MISSING_CHARSET(2.50)[]; TO_DN_NONE(0.00)[]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.17), country: US(-0.00), ip: 2001:470:142::17(-0.49)]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MIME_TRACE(0.00)[0:+]; R_MIXED_CHARSET(1.00)[subject]; R_DKIM_NA(0.00)[]; TAGGED_FROM(0.00)[larch=yhetil.org]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; ARC_NA(0.00)[]; SUBJECT_HAS_QUESTION(0.00)[]; FROM_NEQ_ENVFROM(0.00)[kuba@kadziolka.net,guix-patches-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[kadziolka.net]; HAS_LIST_UNSUB(-0.01)[]; RCPT_COUNT_ONE(0.00)[1]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_SEVEN(0.00)[10]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: +yqDx3H7HAhE --- 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) -- 2.26.2