From patchwork Mon Jul 24 05:36:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fries X-Patchwork-Id: 52156 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 489A827BBEE; Mon, 24 Jul 2023 08:32:00 +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=ham 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 9197527BBE2 for ; Mon, 24 Jul 2023 08:31:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNq2A-0001I3-8i; Mon, 24 Jul 2023 03:31:10 -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 1qNq25-0001GS-US 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 1qNq24-00070Y-Mf for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNq24-00072c-Ic for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64804] [PATCH 1/5] gnu: rust: Add rust-1.69. Resent-From: Fries Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 07:31:04 +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.169018382526941 (code B ref 64804); Mon, 24 Jul 2023 07:31:04 +0000 Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:25 +0000 Received: from localhost ([127.0.0.1]:41624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNq1Q-00070L-1A for submit@debbugs.gnu.org; Mon, 24 Jul 2023 03:30:25 -0400 Received: from mail-4318.protonmail.ch ([185.70.43.18]:11537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNoFW-0003zM-0d for 64804@debbugs.gnu.org; Mon, 24 Jul 2023 01:36:53 -0400 Date: Mon, 24 Jul 2023 05:36:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177003; x=1690436203; bh=c/Yp3O/j9KmYmGHEPDqDHGFIDMuOUyoDjPiv7IMsetM=; 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=wHzVVzRlICXniiRJu2/3oxixVsPTBxZtVi4hQBBO6yXH20ONF0Kt3PgWPElHyVnEL YKSUKS49n/Z0Weqhujvzh5T/H7e7Hc/KywkEFA8kPsWLNssM/gwu1/mvwP1wIyNEPM pLgoKe62oyvcWzISN97YhnDYS5WSSt213fkh91raGEY5lCEVV+EtpOJRjKUQCoMKKY OIfRi4Q5uCQY3zQtkipxHLLCWH2O3Q/LyLKqceI1HpN0+trXki8yrsYWiofq8Qauv6 Le+RRXM0lkDrpKa6ISsJ62QwwwAkEMq3smXKnVIk0HUgCyUsgo5pghbaMVg4J8A24y 4gBqg9n/jdI9w== 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.69): New variable. --- gnu/packages/rust.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) base-commit: b5af0b9c016a65bf32b06a4f118c2ed48f3a80b3 diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 8e106a9927..c0738a6064 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Jim Newsome ;;; Copyright © 2022 Mark H Weaver +;;; Copyright © 2023 Fries ;;; ;;; This file is part of GNU Guix. ;;; @@ -705,6 +706,24 @@ (define rust-1.68 (rust-bootstrapped-package rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcwk")) +(define rust-1.69 + (let ((base-rust + (rust-bootstrapped-package + rust-1.68 "1.69.0" "03zn7kx5bi5mdfsqfccj4h8gd6abm7spj0kjsfxwlv5dcwc9f1gv"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/tikv-jemalloc-sys/jemalloc")) + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))))) + ;;; 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