From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OHz3DfYovmQ9gAEASxT56A (envelope-from ) for ; Mon, 24 Jul 2023 09:32:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SEXdDfYovmQHaAEAauVa8A (envelope-from ) for ; Mon, 24 Jul 2023 09:32:06 +0200 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 19D694B644 for ; Mon, 24 Jul 2023 09:32:06 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=Ur2Yzc6O; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690183926; h=from:from:sender:sender:reply-to: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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Z5LddtNf0zmmVqhTAFUG726IDD1il1sjdTSQhVZomcs=; b=O+rA7A9+70rx4a4naZ5O2MUuEo20V6PZYiLziBeY3Q919ExlnP+3N3tPqBeox34ABCjY1s iuVMYCNLD4egked+xWJrI+89mnhS0CT1eMVAoDXVesgsJZnrdLb79GhoGNoMN44nP2dBqb tBw1pQF9492T9XWoMu6EpRwFGNfaY7yTAxGekwwe03mrshXME0eL1EMhJgU74K/ClcZvFe wx+OOPB+UcLtsm/ioAj+9A5C4/B4f+lKAVXFKONt+Jz/EJmrmwCnq2U2y61MBRgxneQrOB zqkOo9EBw48Y1L4GfVH2J4vyIhtYO0Zkcd/anyR30wTaKFXQ9tqSZSITkRALHg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690183926; a=rsa-sha256; cv=none; b=FJVBSj7ujcIiK+JgK/8AeC1H983Dwm+wZwe8mfGcKgmqA7L/jxDC9U03uuBoauSKOYgE83 GFiAP3Yw3xkXWCEqe8BAyRXAVdxqUo9sKxw16EgQ2nRNYnjyQi1R7mgB5UX8flbpPtDf6/ YVlX7bCted5C0JwkKmhqv+GCJCmzWYt079c/uMUMFxGXz/nl3kzUIpx8xWyXR6SlXhhkB6 hrZV7J8ioK0oZpRA82Ht5z7+WO74kE9M7pwhPXlLokLJwNPXXGsZD8hfVJE3yFrcMTvE3A 84fTR7EREUQhaHozJoKI7pOvhs+u1ZH4C1iQs6uhV06nB3UR8puHD6nNsxm5Rg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=Ur2Yzc6O; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNq27-0001Ho-Qx; Mon, 24 Jul 2023 03:31:07 -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-0001GW-B0 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 1qNq26-00070m-2X for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNq24-00072j-Uo for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64804] [PATCH 2/5] gnu: rust: Add rust-1.70. 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.169018383026952 (code B ref 64804); Mon, 24 Jul 2023 07:31:04 +0000 Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:30 +0000 Received: from localhost ([127.0.0.1]:41626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNq1R-00070U-S4 for submit@debbugs.gnu.org; Mon, 24 Jul 2023 03:30:30 -0400 Received: from mail-40132.protonmail.ch ([185.70.40.132]:28141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNoFV-0003zL-RJ for 64804@debbugs.gnu.org; Mon, 24 Jul 2023 01:36:55 -0400 Date: Mon, 24 Jul 2023 05:36:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177001; x=1690436201; bh=Z5LddtNf0zmmVqhTAFUG726IDD1il1sjdTSQhVZomcs=; 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=Ur2Yzc6OgCNcFCKoaKTWJmo7xiNlehrzNRVgxNKsHRHDpz67OTiweErnoFaos/Bkq ji3yvC9MLm0T3we0o0UnzAiDTPqr8NGPJqrvlbfCcLu01+Ld08CbkUT7wZ399vpr4v CJiM5OEURNi7jq7GRJ0q2I8KmcTx8C3nhGoefbO1c5lJFSjwMfI6d/Ua8CbjUIk7Qn s3EPVs6n0jYjkU/aDXGrCiDxRW7iCy19PhsZ9pQjajgLhVPBIublHN3ez5cC4ad4xa mTFfI8uJX5KFDBSrFGQAEGi1CxaqUqJdsgnnYe4neJBPlNzBLyXMdIomf7QosxJlCr yHYtcUYRCWgVA== Message-ID: <7e849ca25c4cceb184058d3a897c5462896d5695.1690176958.git.fries1234@protonmail.com> In-Reply-To: References: Feedback-ID: 42759890:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 From: Fries via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -5.14 X-Spam-Score: -5.14 X-Migadu-Queue-Id: 19D694B644 X-TUID: fPSDoXu/uvYX * gnu/packages/rust.scm (rust-1.70): New variable. --- .../patches/rust-1.70-fix-rustix-build.patch | 20 +++++++++++++++++++ gnu/packages/rust.scm | 16 +++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 gnu/packages/patches/rust-1.70-fix-rustix-build.patch diff --git a/gnu/packages/patches/rust-1.70-fix-rustix-build.patch b/gnu/pa= ckages/patches/rust-1.70-fix-rustix-build.patch new file mode 100644 index 0000000000..a7e2003aff --- /dev/null +++ b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch @@ -0,0 +1,20 @@ +--- a/vendor/fd-lock/Cargo.toml=092023-05-31 14:44:48.000000000 -0700 ++++ b/vendor/fd-lock/Cargo.toml=092023-07-14 21:19:34.637702319 -0700 +@@ -45,7 +45,7 @@ +=20 + [target."cfg(unix)".dependencies.rustix] + version =3D "0.37.0" +-features =3D ["fs"] ++features =3D ["fs", "cc"] +=20 + [target."cfg(windows)".dependencies.windows-sys] + version =3D "0.45.0" +--- a/src/bootstrap/Cargo.lock=092023-07-11 20:32:40.000000000 -0700 ++++ b/src/bootstrap/Cargo.lock=092023-07-14 22:41:53.269284713 -0700 +@@ -618,6 +618,7 @@ + dependencies =3D [ + "bitflags", ++ "cc", + "errno", + "io-lifetimes", + "libc", diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c0738a6064..0b9afd3ea9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -724,6 +724,22 @@ (define rust-1.69 (for-each delete-file (find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))= ))) =20 +(define rust-1.70 + (let ((base-rust + (rust-bootstrapped-package + rust-1.69 "1.70.0" "0z6j7d0ni0rmfznv0w3mrf882m11kyh51g2bxkj40l3s= 1c0axgxj"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + ;; Rust 1.70 adds the rustix library which depends on the vendored= fd-lock + ;; crate. The fd-lock crate uses Outline assembly which expects a = precompiled + ;; static library. Enabling the "cc" feature tells the build.rs sc= ript to + ;; compile the assembly files instead of searching for a precompil= ed library. + (patches (search-patches "rust-1.70-fix-rustix-build.patch")) + (patch-flags '("-p1"))))))) + ;;; 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 --=20 2.41.0