From patchwork Mon Jul 24 05:36:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fries X-Patchwork-Id: 52154 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 346EE27BBEA; Mon, 24 Jul 2023 08:31:56 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, 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 5E72527BBE9 for ; Mon, 24 Jul 2023 08:31:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNq28-0001Hy-Mo; Mon, 24 Jul 2023 03:31:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qNq26-0001GU-7Q for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNq25-00070i-Gt for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNq25-00072q-Dl for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64804] [PATCH 3/5] gnu: rust: Add rust-1.71. Resent-From: Fries Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 07:31:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64804 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64804@debbugs.gnu.org Cc: Fries , efraim@flashner.co.il, juli@incana.org Received: via spool by 64804-submit@debbugs.gnu.org id=B64804.169018383126960 (code B ref 64804); Mon, 24 Jul 2023 07:31:05 +0000 Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:31 +0000 Received: from localhost ([127.0.0.1]:41628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNq1W-00070f-2k for submit@debbugs.gnu.org; Mon, 24 Jul 2023 03:30:31 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]:26641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNoFf-0003ze-J2 for 64804@debbugs.gnu.org; Mon, 24 Jul 2023 01:37:00 -0400 Date: Mon, 24 Jul 2023 05:36:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177013; x=1690436213; bh=rxG3TdL/FvIG4xByqSFfi6yfbjBt9Yp1Sz5O4lZtXaU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Z0Oo7l006WhxAkZkhVcc+erlUVfFbpdTJfpk2+U5pDUsP60He+NOZ+ZsHjML2zY65 Xu+IDhYSwQyal1hhdM+c2jE/WQX/jZDuTynRDHCb44MvaBGeM8jTaVP43CJnfWgPIw NlxjPNcVkB5RJAxcPAoLq8ZMji6YIWgRW7ZwjmA5/63fq2AF2+0pB7Pnq3RIvCaR5p NLfDW29ucf4jPtbpOBkg/3wSiMjuE0NPpCyUuLQCnYWBLq/yzbkUwCKv9R/ATdHsW3 ZV5rVWEsMlAtCTQid1N78H5p0BV4Qlo7LndC3dABbh3CWfWj05r/PcrJruNIsDfXd7 UDa8T91tNspIw== Message-ID: In-Reply-To: References: Feedback-ID: 42759890:user:proton MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400 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: , Reply-to: Fries X-ACL-Warn: , Fries via Guix-patches X-Patchwork-Original-From: Fries via Guix-patches via From: Fries Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust.scm (rust-1.71): New variable. --- gnu/packages/rust.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0b9afd3ea9..b65390c97c 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -740,6 +740,28 @@ (define rust-1.70 (patches (search-patches "rust-1.70-fix-rustix-build.patch")) (patch-flags '("-p1"))))))) +(define rust-1.71 + (let ((base-rust + (rust-bootstrapped-package + rust-1.70 "1.71.0" "15jc0d13cmrh2xvpkyyvsbwgn3w4klqiwf2wlgzfp22mvjmy8rx6"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-cargo-checksums + (lambda _ + ;; Cargo's Cargo.lock file needs to have its checksums replaced so + ;; the Cargo build doesn't fail. + (substitute* '("Cargo.lock" + "src/bootstrap/Cargo.lock" + "src/tools/rust-analyzer/Cargo.lock" + "src/tools/cargo/Cargo.lock") + (("(checksum = )\".*\"" all name) + (string-append name "\"" ,%cargo-reference-hash "\""))) + (generate-all-checksums "vendor")))))))))) + ;;; 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