From patchwork Thu Aug 4 01:47:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Newsome X-Patchwork-Id: 41219 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 15A0B27BBEA; Thu, 4 Aug 2022 02:50:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 964B027BBE9 for ; Thu, 4 Aug 2022 02:50:21 +0100 (BST) Received: from localhost ([::1]:46718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJQ0C-00013u-OW for patchwork@mira.cbaines.net; Wed, 03 Aug 2022 21:50:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJPzu-00011u-OF for guix-patches@gnu.org; Wed, 03 Aug 2022 21:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60877) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJPzu-0001dn-EG for guix-patches@gnu.org; Wed, 03 Aug 2022 21:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oJPzu-0007B9-AM for guix-patches@gnu.org; Wed, 03 Aug 2022 21:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54439] [PATCH core-updates 1/2] gnu: rust: decouple rust-1.57 and "rust" References: In-Reply-To: Resent-From: Jim Newsome Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Aug 2022 01:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54439 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54439@debbugs.gnu.org, Maxime Devos Cc: Jim Newsome , Paul Alesius , Felipe Balbi , kiasoc5@tutanota.com, Pierre Langlois Received: via spool by 54439-submit@debbugs.gnu.org id=B54439.165957778027547 (code B ref 54439); Thu, 04 Aug 2022 01:50:02 +0000 Received: (at 54439) by debbugs.gnu.org; 4 Aug 2022 01:49:40 +0000 Received: from localhost ([127.0.0.1]:50621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJPzX-0007AE-IR for submit@debbugs.gnu.org; Wed, 03 Aug 2022 21:49:39 -0400 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:44423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJPzV-00079y-Qw for 54439@debbugs.gnu.org; Wed, 03 Aug 2022 21:49:38 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailnew.west.internal (Postfix) with ESMTP id B862C2B05C41; Wed, 3 Aug 2022 21:49:31 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 03 Aug 2022 21:49:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jimnewsome.net; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm1; t=1659577771; x=1659581371; bh=kex8moIkjo QBsibiUYcTUG9NvFMfXOl9M++HKqjwPU4=; b=zSxJ+daj1mJf/ZGLIGv/5w1o9x ltkBd+bHfExMODGXNuKsmN/LeJRIMoJFBeInSap3F3TObD4MuPMCImjSwlQhTtpk HA085oYxJTDWcVvmfLK3Cv8KA2sBSP8s4W4XziYYjmftf8ZqB1MycbnRIKvVrWtE pBGHGgxGlEkLBDaGnaQJKZ1/FWA11FUgxRVHT85Wqazh9Ap9HtpLLLqp0N83XhUq geM2pDJNuC8ql7RRN3+lMQaZwyYiEWqadPywZokpld4xj3K1gPZJE2mUfFR4xJbL KGR1GJEumHf5TpNB8gkvSwZRxxzH960Shw4lbbw88XHik1lc4f6wJ09rV2XA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1659577771; x=1659581371; bh=kex8moIkjoQBsibiUYcTUG9NvFMfXOl9M++ HKqjwPU4=; b=Xsd43SFr8lTIm5n+S9rzo3ft+vS4RftpDAOAaaqUXa1syGMzqEp KT0Zckbb+DA0BdFkc4qjqdsVvrnEdlhS/ygNfpd5iLvGVILmL0B1kHGsnk8Bqd+Z WLvawT9AETFsR8TMohRc5Lelbod/Cr62VgSwAOvjZ2dEMrf16QwZTpjYUt+ZF4mJ iAOmB79TWCKeDTVPi+AX25beUnM1l9xgqESCbTe+DOC2Z4tWUMS0Byh/sfyxQqOK 211W8L8S3napf4XY5N8AmLrHwAhHbAPgOO2tIjBYm2ip8EfESh2dueIr8BD0linJ bNBSFFEc5jOE2QW399d47Kn/E0itGSeTeKA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvkedgheefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheplfhimhcupfgv fihsohhmvgcuoehjihhmsehjihhmnhgvfihsohhmvgdrnhgvtheqnecuggftrfgrthhtvg hrnhepvdetffeuffeigeeiudehkeehkefhffduiefhtddvgfdtgffhueffveelteeiudek necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhimh esjhhimhhnvgifshhomhgvrdhnvght X-ME-Proxy: Feedback-ID: ib1a94636:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 3 Aug 2022 21:49:29 -0400 (EDT) From: Jim Newsome Date: Wed, 3 Aug 2022 20:47:17 -0500 Message-Id: <7125a9c1de14dca78c45d16ddeb29339b49ffde7.1659577396.git.jnewsome@torproject.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Jim Newsome * gnu/packages/rust.scm (rust-1.57, rust): decouple the definition of rust-1.57, which happens to be the current latest, from the definition of rust, which is always the latest. The latter re-enables tests and extra components, which should always be done only on the final public rust package, not specifically rust-1.57. --- gnu/packages/rust.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) base-commit: 8a2b5f3f587459c11c037b9d372b4070263baae9 diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 759bf9a631..d85acef696 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -540,10 +540,18 @@ (define rust-1.56 (generate-all-checksums "vendor")))))))))) (define rust-1.57 - (let ((base-rust - (rust-bootstrapped-package - rust-1.56 "1.57.0" - "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim"))) + (rust-bootstrapped-package + rust-1.56 "1.57.0" "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim")) + +;;; Note: Only the latest versions of Rust are supported and tested. The +;;; intermediate rusts are built for bootstrapping purposes and should not +;;; be relied upon. This is to ease maintenance and reduce the time +;;; required to build the full Rust bootstrap chain. +;;; +;;; Here we take the latest included Rust, make it public, and re-enable tests +;;; and extra components such as rustfmt. +(define-public rust + (let ((base-rust rust-1.57)) (package (inherit base-rust) (outputs (cons "rustfmt" (package-outputs base-rust))) @@ -682,12 +690,6 @@ (define rust-1.57 `("procps" ,procps) (package-native-inputs base-rust)))))) -;;; Note: Only the latest versions of Rust are supported and tested. The -;;; intermediate rusts are built for bootstrapping purposes and should not -;;; be relied upon. This is to ease maintenance and reduce the time -;;; required to build the full Rust bootstrap chain. -(define-public rust rust-1.57) - (define-public rust-src (hidden-package (package From patchwork Thu Aug 4 01:47:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Newsome X-Patchwork-Id: 41220 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 D810627BBEA; Thu, 4 Aug 2022 02:51:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 585DF27BBE9 for ; Thu, 4 Aug 2022 02:51:11 +0100 (BST) Received: from localhost ([::1]:47584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJQ10-0001bi-IH for patchwork@mira.cbaines.net; Wed, 03 Aug 2022 21:51:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJPzv-00012M-4a for guix-patches@gnu.org; Wed, 03 Aug 2022 21:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJPzu-0001eA-RV for guix-patches@gnu.org; Wed, 03 Aug 2022 21:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oJPzu-0007BH-NL for guix-patches@gnu.org; Wed, 03 Aug 2022 21:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54439] [PATCH core-updates 2/2] gnu: rust: Use rust-1.60.0 Resent-From: Jim Newsome Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Aug 2022 01:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54439 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54439@debbugs.gnu.org, Maxime Devos Cc: Jim Newsome , Paul Alesius , Felipe Balbi , kiasoc5@tutanota.com, Pierre Langlois Received: via spool by 54439-submit@debbugs.gnu.org id=B54439.165957779427576 (code B ref 54439); Thu, 04 Aug 2022 01:50:02 +0000 Received: (at 54439) by debbugs.gnu.org; 4 Aug 2022 01:49:54 +0000 Received: from localhost ([127.0.0.1]:50626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJPzm-0007Ai-0g for submit@debbugs.gnu.org; Wed, 03 Aug 2022 21:49:54 -0400 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:58057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJPzj-0007AU-M0 for 54439@debbugs.gnu.org; Wed, 03 Aug 2022 21:49:52 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 94E872B05C41; Wed, 3 Aug 2022 21:49:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 03 Aug 2022 21:49:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jimnewsome.net; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1659577785; x= 1659581385; bh=sFrRnNs94afAngeUlzcPPJ97W2bRvfWtkP0s8cvbmDQ=; b=B 1M80wMrwX2GoP9iV/kGaVryvg251ofMKryUTN+YV7vClf8ueRHNC5JzULUm6mV81 gb+jcfeaVIJHc4+OisqF1GzGNs9uXJ2R0eubExRTE9foA/fCDi5SY9gkFRFqmbA0 bbkFTbgVSnamrVJkUale9KnB8JNvHs2KOXed9OVOv2j1O5REzQLf/iPN4WJbY+Jj 3Nz9ucL+bHzs3emtzhibuFVxPF/4CFR7g25RyArufKPcwXxx89ZqEgdU+C1K1UOA yPkiKwkeIEILt/CJKuc2KvXxvgte5ymC2zamNmlYWo7sskQPHQd6GwDuYGyMeylL 9Zp0G5qahzXZtTLSnJfww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1659577785; x=1659581385; bh=sFrRnNs94afAn geUlzcPPJ97W2bRvfWtkP0s8cvbmDQ=; b=QCxld/hIqRLgC6TlKw8JGSrN2K97E 5m85DuDli4RAGigruZdqcw0+SEYS2Q7/2Iuo1SZUA7YjQjYZmE/l4bMe4qloZU6X QOpCdvk3PBF1uy59jRFcrewnWDTIPNwifq+cKPwf6tUnBAVduhQGlDNfo7AOpoxv WOsRvO4rQib+trvrLvNzvZBCOMOi4qWpygtLcyW/ZIKLDW6JDZ2zQCzyvY1EeyVq 5XcgnQLuA7w/cJoxUXtv8aiYQe07LIyF8RTTcVYXhtL7br7KczMJaREcKFydwwNR mvgkjzsiH5aUYUSxd46Q8mWGqJonkO2MDtFP02lPFUL3DvaKCDmI8pbAg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvkedgheefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheplfhimhcu pfgvfihsohhmvgcuoehjihhmsehjihhmnhgvfihsohhmvgdrnhgvtheqnecuggftrfgrth htvghrnheplefguefgkefhffffieekjeehkeejhfevhfetudehveffheejfeefveekffeg veeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjh himhesjhhimhhnvgifshhomhgvrdhnvght X-ME-Proxy: Feedback-ID: ib1a94636:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 3 Aug 2022 21:49:44 -0400 (EDT) From: Jim Newsome Date: Wed, 3 Aug 2022 20:47:19 -0500 Message-Id: <42db48eec3d7011d13d49f816604c8338c3b6c43.1659577396.git.jnewsome@torproject.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <7125a9c1de14dca78c45d16ddeb29339b49ffde7.1659577396.git.jnewsome@torproject.org> References: <7125a9c1de14dca78c45d16ddeb29339b49ffde7.1659577396.git.jnewsome@torproject.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Jim Newsome * gnu/packages/rust.scm (rust-1.58, rust-1.59, rust-1.60, rust): Add rust-1.58, rust-1.59, and rust-1.60, and update rust to be based on rust-1.60 instead of rust-1.57. --- gnu/packages/rust.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d85acef696..ebad9dc9e5 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -541,8 +541,35 @@ (define rust-1.56 (define rust-1.57 (rust-bootstrapped-package + ;; Verified that it *doesn't* build with 1.55. e.g.: + ;; * feature `edition2021` is required rust-1.56 "1.57.0" "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim")) +(define rust-1.58 + (rust-bootstrapped-package + ;; Verified that it *doesn't* build with 1.56. e.g.: + ;; * error: attributes starting with `rustc` are reserved for use by the + ;; `rustc` compiler + ;; * error: cannot find attribute `rustc_do_not_const_check` in this scope + ;; * error[E0522]: definition of an unknown language item: + ;; `const_eval_select_ct` + rust-1.57 "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8")) + +(define rust-1.59 + (rust-bootstrapped-package + ;; Verified that it *doesn't* build with 1.57. e.g.: + ;; * error: `doc(primitive)` should never have been stable + ;; * error[E0522]: definition of an unknown language item: + ;; `generator_return` + ;; * error[E0206]: the trait `Copy` may not be implemented for this type + rust-1.58 "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57")) + +(define rust-1.60 + (rust-bootstrapped-package + ;; Verified that it *doesn't* build with 1.58. e.g.: + ;; * error: unknown codegen option: `symbol-mangling-version` + rust-1.59 "1.60.0" "1drqr0a26x1rb2w3kj0i6abhgbs3jx5qqkrcwbwdlx7n3inq5ji0")) + ;;; Note: Only the latest versions of Rust are supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not ;;; be relied upon. This is to ease maintenance and reduce the time @@ -551,7 +578,7 @@ (define rust-1.57 ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.57)) + (let ((base-rust rust-1.60)) (package (inherit base-rust) (outputs (cons "rustfmt" (package-outputs base-rust)))