From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MCqeB941EWHJAgEAgWs5BA (envelope-from ) for ; Mon, 09 Aug 2021 16:04:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wKVfA941EWHFYQAAB5/wlQ (envelope-from ) for ; Mon, 09 Aug 2021 14:04:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.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 3F4811D667 for ; Mon, 9 Aug 2021 16:04:12 +0200 (CEST) Received: from localhost ([::1]:49176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mD5sw-0001dy-KW for larch@yhetil.org; Mon, 09 Aug 2021 10:04:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mD5fH-0007iU-0L for guix-patches@gnu.org; Mon, 09 Aug 2021 09:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mD5fG-0003Xp-OJ for guix-patches@gnu.org; Mon, 09 Aug 2021 09:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mD5fG-0006OR-K6 for guix-patches@gnu.org; Mon, 09 Aug 2021 09:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49956] [PATCH] gnu: Add rust-1.53. Resent-From: Matthew James Kraai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Aug 2021 13:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49956 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49956@debbugs.gnu.org Cc: Matthew James Kraai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162851698124540 (code B ref -1); Mon, 09 Aug 2021 13:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Aug 2021 13:49:41 +0000 Received: from localhost ([127.0.0.1]:56406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mD5et-0006Nj-Go for submit@debbugs.gnu.org; Mon, 09 Aug 2021 09:49:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:51450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mD5ec-0006NO-Nz for submit@debbugs.gnu.org; Mon, 09 Aug 2021 09:49:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mD5eY-0006O3-T8 for guix-patches@gnu.org; Mon, 09 Aug 2021 09:49:22 -0400 Received: from mail.ftbfs.org ([52.8.68.13]:60708 helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mD5eV-0002xm-OD for guix-patches@gnu.org; Mon, 09 Aug 2021 09:49:17 -0400 Received: from ip68-228-72-85.oc.oc.cox.net ([68.228.72.85] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mD5eN-0007M2-Fx; Mon, 09 Aug 2021 13:49:10 +0000 From: Matthew James Kraai Date: Mon, 9 Aug 2021 06:49:03 -0700 Message-Id: <20210809134903.19916-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628517852; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8+sj+9Hgx4JY/DHSpJ/M6zXN6XqgtEfTpbYi1EUF7Rg=; b=Tj1VaVOqqneGjlzIiReJ8Zee/I/CfJgmVpRs0tnxk8kWZxFU7/tH9lMWAzZvOIFyg5X2Au 0tDPVWZCV0PBiGLyO5iQiWmIrk0xgxhu3KYw8/j2C0cTf9VLdR5EuU/+kk1+gCLe2Ry3SG t8hValyZfDwhwIZZnRibzrRzZasCCYHtEwpsbQbMrSDXqecdUG2Xb63jGr6AEnAbqEQrXo O/pEqKm8eaV/FmZTtXiy8d1QW6GeEk+i2YKBiW0f8lW42Oar/WfU90tkE6b8hpKEi0Ss+M pXWT3fyAuE+Q6ib8lHUrOGvwOshTzohbt/hI0cTAdLNDrM6zXf/btplPyIfjCQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628517852; a=rsa-sha256; cv=none; b=VouoCeCJXLvu3725J9h4KOLD3k3PwMrkLDJ2vmpyl7SD4kaDreET7pbO+76fkf3oeD2kbF sN0jn6AUzRN3/IHTCQCghdbIEx15Sd98r4IaxzhD3PhcVYysCr8eFcUh5j2AlSxGp2kMJc 7/Wwb0rhpeLy6jGpo7phfC+uyPzhMEsCxzbAHuuCDEfNt7AsO5Rpy5nEp0iXQtuXMdrWYW VdGTJUsJ8xTW+TJuVpx1qE9ZjY/mFa8+fj96m4c/CWvOsmBgOz7nIMzn+gg0bUHqozmM8p KsVTwGBwuvSTnvAbFe3RTxxzRuXeNzLTyPPmJwyoESVcgKa4xsCA0DZayGeu9g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.39 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3F4811D667 X-Spam-Score: 3.39 X-Migadu-Scanner: scn1.migadu.com X-TUID: TpVT9Pg8fx2B * gnu/packages/rust.scm (rust-1.53): New variable. --- gnu/packages/rust.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 73f94a3929..bb4da17243 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020, 2021 Jakub Kądziołka ;;; Copyright © 2020 Pierre Langlois -;;; Copyright © 2020 Matthew James Kraai +;;; Copyright © 2020, 2021 Matthew James Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -1474,5 +1474,31 @@ move around." (alist-replace "llvm" (list llvm-12) (package-inputs base-rust)))))) +(define-public rust-1.53 + (let ((base-rust + (rust-bootstrapped-package rust-1.52 "1.53.0" + "1f95p259dfp5ca118bg107rj3rqwlswy65dxn3hg8sqgl4wwmxsw"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + ;; Some tests got split out into separate files. + (replace 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "library/std/src/process/tests.rs" + (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\""))) + (substitute* "library/std/src/sys/unix/process/process_common/tests.rs" + (("fn test_process_mask") "#[allow(unused_attributes)] + #[ignore] + fn test_process_mask")) + (substitute* "src/test/codegen/alloc-optimisation.rs" + (("// min-llvm-version: 10.0.1") "// no-system-llvm")) + (substitute* "src/test/ui/asm/sym.rs" + (("// min-llvm-version: 10.0.1") "// no-system-llvm")) + #t)))))))))) + ;; TODO(staging): Bump this variable to the latest packaged rust. (define-public rust rust-1.45) -- 2.32.0