Received: (at 64804) by debbugs.gnu.org; 30 Sep 2023 15:41:04 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 30 11:41:04 2023 Received: from localhost ([127.0.0.1]:59676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qmc5Y-0007AO-2G for submit <at> debbugs.gnu.org; Sat, 30 Sep 2023 11:41:04 -0400 Received: from gmmr-4.centrum.cz ([46.255.227.205]:46858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <milan.svoboda@HIDDEN>) id 1qmc5V-00079p-5M for 64804 <at> debbugs.gnu.org; Sat, 30 Sep 2023 11:41:02 -0400 Received: from gmmr-1.centrum.cz (envoy-stl.cent [10.32.56.18]) by gmmr-4.centrum.cz (Postfix) with ESMTP id D2DA281F0 for <64804 <at> debbugs.gnu.org>; Sat, 30 Sep 2023 17:40:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=centrum.cz; s=mail; t=1696088443; bh=OyZvyd06lluU5aBKYN8EHSiEF+ZYRlIE07c65uGpjy0=; h=Date:To:From:Subject:From; b=ga0LSAdbxrSkJelewRPA/+4xWttNKSG1GU0BuIobX/bRc6SWuNuH4AtBd/hyuVp6p 5pSEr43myqzdynUbCcVO3Wxe7TU1W6PQZ0w6DBAq9rmX6ctsgHhM2yiDKx9DrvMPuw qeZxy2NIUNZ7A1iOI1V3PrjvPRWdoa5KvEHUFrxw= Received: from gmmr-1.centrum.cz (localhost [127.0.0.1]) by gmmr-1.centrum.cz (Postfix) with ESMTP id CF8261A0 for <64804 <at> debbugs.gnu.org>; Sat, 30 Sep 2023 17:40:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=centrum.cz; s=mail; t=1696088443; bh=OyZvyd06lluU5aBKYN8EHSiEF+ZYRlIE07c65uGpjy0=; h=Date:To:From:Subject:From; b=ga0LSAdbxrSkJelewRPA/+4xWttNKSG1GU0BuIobX/bRc6SWuNuH4AtBd/hyuVp6p 5pSEr43myqzdynUbCcVO3Wxe7TU1W6PQZ0w6DBAq9rmX6ctsgHhM2yiDKx9DrvMPuw qeZxy2NIUNZ7A1iOI1V3PrjvPRWdoa5KvEHUFrxw= Received: from antispam26.centrum.cz (unknown [10.30.208.26]) by gmmr-1.centrum.cz (Postfix) with ESMTP id CE6DC19E for <64804 <at> debbugs.gnu.org>; Sat, 30 Sep 2023 17:40:43 +0200 (CEST) X-IPAS-Result: =?us-ascii?q?A2E/HABsQBhl/0vj/y5aHAEBATwBAQQEAQECAQEHAQEVC?= =?us-ascii?q?YFGAoZYAYMEkTKEbIFVhV6HSYN/hG+BVoF+DwEBAQEBAQEBAR0BBygEAQEUh?= =?us-ascii?q?GqHGCc1CA4BAgQBAQEBAwIDAQEBAQEBAwEBBgEBAQEBAQYFAQKBGYUvRoI3J?= =?us-ascii?q?IQdFWkNAiYCbAgBAYJ6gioBNLJmgTIaAmWEd6xuBYEeH4FogRouAYdvGgEFY?= =?us-ascii?q?4lUgVVEgTyCVAGFfoMOgmgEiUOFPgeGLYEvigsqgQgIXYFqPQINVAsLXYERg?= =?us-ascii?q?VB0AgIRORMFQnAbAwcDgQQQKwcELyIGCRYtJQZRBC0kCRMSPgSDOAqBBj8RD?= =?us-ascii?q?hGCRGE2GUuCWwkVDDVOdhArBBQXgRNuHxUeNhESFw0DCHYdAhEjPAMFAwQ2C?= =?us-ascii?q?hUNCyEFE0QCAUcGSwsDAhwFAwMEgTYFDx4CEC4nAwMZTgIQFAM+AwMGAwsyA?= =?us-ascii?q?zBXSwxIBA4DGSsdQAIBC209NQkLGwY+AqdzgUdqk0iQQoxBlDM0B4QPBYFUB?= =?us-ascii?q?gyCW4YYli4GEy+DbgESjG+GPRYDkhuGJZINowKHKgGCFDMag1tRGaIigS8CB?= =?us-ascii?q?wsBAQMJhk2CVYInAQE?= IronPort-PHdr: A9a23:8rW1ax1YMVSIAhkIsmDOagQyDhhOgF0UFjAc5pdvsb9SaKPrp82kY BaPo6w0xwWZFcWDsrQY0bSQ6/ihEUU7or+5+EgYd5JNUxJXwe43pCcHRPC/NEvgMfTxZDY7F skRHHVs/nW8LFQHUJ2mPw6arXK99yMdFQviPgRpOOv1BpTSj8Oq3Oyu5pHfeQpFiCS+bL9oM Rm6sArdutcVjIB/Lqo91gbFrmFHduhIxG5kP06fkwr56syt4JNt7iNctu47+cVdS6v6ZaM4T bJZDDQiLW844dDguAfAQwWS+HYSS30anRVUDQfL6hH6RYrxvTDhtuVhwimaPNb5Qq4yVD+/8 qpkUh7oiCMANz4k7GHaj9F7gaxHrB69oRF03ojZa5yXOvVjZKPQZdAUS2ROUclfSSJPAp6yY JcAAecaIeZVrZPwq0cSoRawBwShAv7kxD9Shn/x2K03y+MvEQDC3AM6GdIFrWnarMvyNKgJV uC60bPHxijEYvNT2Df97JLHchY7rfGXQ7JwdtHeyU4yGAzflViftZLqPzWJ1uQXrmib6vBsW v6uimM+rQx6vzegyNs2hIbTmoIV1k7L9T9/wIstONG1SEF2bcCgHZZOuSyWKYh7T98+Tm12u ys21L0ItJC6cSYF1Jkqwx7RZvibfoWU4B/uWuacLCt2in9qe7+xiBC/+lWjxO3kTsS531dHo jBbntTMtn0BzQLf5taFR/dn/Eqs2S6D2gTT5+1eIk05lbDXJ4Ahz7M/jJYfrEvOEjHwlU7rl qGZbF8k9fKt6+n/Z7XmoYKTOJFshwHlN6QuhtS/AeMlMggSR2Sb+fqz1Lnk/UDhT7VKi+Q6k rLcsJDGPcQXu7O1DxVJ3Yk97Ra/Ey2m0MkdnXUdMF1EeQqLj4nvO17QPPD1FfiyjlW2nDt1x /3LPqftDovTInXBirvsf7Zw51ZZyAUpzNBf45xUCqsGIPL2QkLxsd3YDhsjPAyy2ernE8t91 oQFVmKIH6CWKrjfvkOW6eIpP+mMfpIVuDPnJ/c55v/ilXk5lkQFcqmzwZQXcGy4HuhhI0iBf Hbgms0BHnsSvgoiUOzqj0WPXD9canuxQ64x6So2B5+4AojYXY+tnbOB3DyhEp1ZYGBGF0qAE XDyd4WLCL8wb3fMfp85zhQIWLKrVoA6kx6oqUn90bU0APDT/3g9tJbq0pBO+erZkh07vWhxD sCU1SeWUWZ+mW8BbzQ72rxlvEk7wUXVgvswuOBRCdEGv6ABaQw9L5OJl4RH IronPort-Data: A9a23:eNDqjKD3/gu/fBVW/4Dhw5YqxClBgxIJ4kV8jS/XYbTApG9whjFWm GpLXDyEP63cMDHzKtAgPI3g9x4E7MeEyoVqOVdlrnsFo1CmCCbm6XZ1Cm+qYkt+++WaFBoPA /02M4WGdoZtJpPljk/FGqD7qnVh3r2/SLP5CerVUgh8XgYMpB0J0HqPoMZnxNYz6TSFK1nV4 4iq8paHYAXNNwNcawr41YrS9XuDg9yt4Fv0jnRmDdhXsVnXkWUiDZ53Dcld+FOlKmX8NrfSq 9frlNlVzEuAl/seIo/NfoLAT6E/auW60T6m0SMKBvf40nCukQRpukozHKJ0hU66EFxllfgpo DlGncTYpQvEosQgMQnSOvVVO3gWAEFIxFPICXegtcDP1FScSkPD2+9AFU8kZd0h888iVAmi9 dRAQNwMRh+Gwvmz3KriE69ni8I/NtTueogN0p1i5W2HS6x7HNaZGfqMuoIwMDQY36iiGd7bZ s4Qb3x0chPKZBFGElwaDo4kgeLujWuXnzhw8Q/M9fNuvTWCpOB3+IDgIfv5IOOtftp2hB7I/ CX05GOjWzhPYbRzzhLAqBpAnNTnw3+rAN46GLCy/ONlmxucwHFVDwcZPWZXutHl1AjkBo8Zc RZLvHVzxUQvyHGWohDGd0XQiBa5UtQ0AbK8z8VSBNmx95fp IronPort-HdrOrdr: A9a23:dOkFeanoenQYFZhxSLbj6ttP0KnpDfI93DAbv31ZSRFFG/Fw5P rBoB19726QtN9xYgBDpTnuAsS9qB/nlaKdgrN8AV7BZmPbUQKTRekI0WKI+UyCJ8SRzI9gPO tbHJRDNA== X-Talos-CUID: =?us-ascii?q?9a23=3AmA2NeGl5xNqJHty/uzF7udU5aaDXOXLCyHuMOFb?= =?us-ascii?q?iMF5GUKe7UFGCoPNdmuM7zg=3D=3D?= X-Talos-MUID: 9a23:d4be/wR/yX2/5fqQRXTUiSBDGJ1XxJ+xK1pVwc9BidKDb3VZbmI= X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.03,190,1694728800"; d="scan'208";a="151811659" Received: from unknown (HELO gm-smtp11.centrum.cz) ([46.255.227.75]) by antispam26.centrum.cz with ESMTP; 30 Sep 2023 17:40:43 +0200 Received: from [192.168.1.237] (unknown [95.85.254.142]) by gm-smtp11.centrum.cz (Postfix) with ESMTPA id 907D2100AE2DA for <64804 <at> debbugs.gnu.org>; Sat, 30 Sep 2023 17:40:43 +0200 (CEST) Message-ID: <a366f510-0f9e-c82f-ddc5-71034ba45668@HIDDEN> Date: Sat, 30 Sep 2023 17:40:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US To: 64804 <at> debbugs.gnu.org From: Milan Svoboda <milan.svoboda@HIDDEN> Subject: Please merge it Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64804 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hello, it would be wonderful if this could be merged. I am trying to package broot (command line file manager) and one of it's dependency requires rust 1.70.0. Pretty please.
guix-patches@HIDDEN:bug#64804; Package guix-patches.
Full text available.Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:46 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 24 03:30:46 2023 Received: from localhost ([127.0.0.1]:41634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qNq1m-00071G-5e for submit <at> debbugs.gnu.org; Mon, 24 Jul 2023 03:30:46 -0400 Received: from mail-40140.protonmail.ch ([185.70.40.140]:22567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <fries1234@HIDDEN>) id 1qNoU2-0004Si-46 for 64804 <at> debbugs.gnu.org; Mon, 24 Jul 2023 01:51:51 -0400 Date: Mon, 24 Jul 2023 05:51:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177903; x=1690437103; bh=Y8HOIj6xi0VBKUTcrCqGGSHRdB86FSM7g8BedBO4cOY=; 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=rYg8dVLelpyNCtKZIFbaWeIw3EHeqU+nE7odPy0/DvYo3swo6v+K9crh9jW2B9uCE RptbBfOXi9HpaoDT22x/DKp0dYN4PRU0xbpR5DK/49ZTxOtQMYNfFVEBJef/svwY/0 axZIwHbKVPKyvxkI/1S+jIidlDhoYgmoAju2WDT+a1fTIPKzy92xnlUIit5If/njEj U0Zb12ykcvGjzTmBAd9ro5e9Yx+r5t8xrhgkqY7VlyFe28S4Uk1sKDBkJ+w+/BO7vg WdBcFxlHW6VMhWB4I3WXp+Cuks9pxGdapoSnildQL7Iq+mKTbtTpGZtZBtMD40cm0b 2OFcOvqv8zyOA== To: 64804 <at> debbugs.gnu.org From: Fries <fries1234@HIDDEN> Subject: Re: [PATCH 5/5] gnu: rust: Update to 1.71. Message-ID: <5954949.lOV4Wx5bFT@pc> In-Reply-To: <5a852a27410291cb2dda00ed3f137b3cfbbca645.1690176958.git.fries1234@HIDDEN> References: <MZN9YR.MV79N2FVWSJD@HIDDEN> <5a852a27410291cb2dda00ed3f137b3cfbbca645.1690176958.git.fries1234@HIDDEN> Feedback-ID: 42759890:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 64804 X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400 Cc: Fries <fries1234@HIDDEN>, efraim@HIDDEN, Juliana Sims <juli@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.8 (/) git-send-email wouldn't let me make a cover letter as the teams script thou= ght=20 it was an invalid patch so i'm going to send this email here. this patch series updates the rust package to rust 1.71.0! this means progr= ams=20 that require newer std api's like the stablized OnceCell API that was added= in=20 rust 1.70 can be used! i submitted this patch before and i got some feedbac= k=20 from juliana so i split my patches into a patch series.=20 i don't know what branch this should go in but i checked the submitting pat= ch=20 webpage and i think as a rust update would mean a lot of rebuilding, i thin= k=20 it should go into the core-updates branch but i see theres also a rust-team= =20 branch. i don't know which one would be optimal.
guix-patches@HIDDEN:bug#64804; Package guix-patches.
Full text available.
Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 24 03:30:46 2023
Received: from localhost ([127.0.0.1]:41632 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qNq1X-00070u-GG
for submit <at> debbugs.gnu.org; Mon, 24 Jul 2023 03:30:46 -0400
Received: from mail-40130.protonmail.ch ([185.70.40.130]:15663)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <fries1234@HIDDEN>) id 1qNoFy-00041A-2a
for 64804 <at> debbugs.gnu.org; Mon, 24 Jul 2023 01:37:19 -0400
Date: Mon, 24 Jul 2023 05:36:53 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;
s=protonmail3; t=1690177031; x=1690436231;
bh=NyadBzLjQltO+hvaTvsKKRWWKXX6f9n4Nl9A5FQ0alc=;
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=NOp/5Ya47h2Zsrp5q7jfuuoNdCCcOLke1kiSWPjkQRnPw5C+G8+a1QvJZB2LBWSRb
cy7NFZ53+FwP/UfBO3xM8/eXlF7ft1iFBneD9a0IB6HA/XT7kFL9z8LHVnXDBWC7tu
b4p2Dvw0hFc8vVCBTgNzLbbHKkgzcgIHSEm955BxGaCFGjz7aJWj1l337lVGIjEXcr
FK74IncSn6WrPD60MZpEISGca06r/MEeaTnEIbMb2555pvqm1K6E3re+4I4rvRl6hz
YGEXDDVzFEx3QFU9wZxKX6vCo2wOaFz/9EL6WDBpXihcu+mzQVfQI3rwO/c/Ymu0rG
WQz7/O9ML9ciQ==
To: 64804 <at> debbugs.gnu.org
From: Fries <fries1234@HIDDEN>
Subject: [PATCH 5/5] gnu: rust: Update to 1.71.
Message-ID: <5a852a27410291cb2dda00ed3f137b3cfbbca645.1690176958.git.fries1234@HIDDEN>
In-Reply-To: <MZN9YR.MV79N2FVWSJD@HIDDEN>
References: <MZN9YR.MV79N2FVWSJD@HIDDEN>
Feedback-ID: 42759890:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 64804
X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400
Cc: Fries <fries1234@HIDDEN>, efraim@HIDDEN, juli@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)
* gnu/packages/rust.scm (rust): Update to 1.71.
[arguments]: Extend the disable-tests-requiring-git and
disable-tests-requiring-mercurial phases to ignore more tests that will
fail the build.
---
gnu/packages/rust.scm | 55 +++++++++++++++++++++++++++++++------------
1 file changed, 40 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 03681d55ac..505075b9d6 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -776,7 +776,7 @@ (define rust-1.71
;;; Here we take the latest included Rust, make it public, and re-enable t=
ests
;;; and extra components such as rustfmt.
(define-public rust
- (let ((base-rust rust-1.67))
+ (let ((base-rust rust-1.71))
(package
(inherit base-rust)
(outputs (cons "rustfmt" (package-outputs base-rust)))
@@ -811,23 +811,42 @@ (define-public rust
(which "env")))))
(add-after 'unpack 'disable-tests-requiring-git
(lambda _
- (substitute* "src/tools/cargo/tests/testsuite/new.rs"
- (("fn author_prefers_cargo")
- "#[ignore]\nfn author_prefers_cargo")
- (("fn finds_author_git")
- "#[ignore]\nfn finds_author_git")
- (("fn finds_local_author_git")
- "#[ignore]\nfn finds_local_author_git"))))
+ (substitute* "src/tools/cargo/tests/testsuite/git.rs"
+ ,@(make-ignore-test-list
+ '("fn fetch_downloads_with_git2_first_then_with_gito=
xide_and_vice_versa"
+ "fn git_fetch_cli_env_clean"
+ "fn git_with_cli_force"
+ "fn use_the_cli")))
+ ;; Gitoxide tests require the network.
+ (substitute* "src/tools/cargo/tests/testsuite/git_shallo=
w.rs"
+ ,@(make-ignore-test-list
+ '("fn gitoxide_clones_git_dependency_with_shallow_pr=
otocol_and_git2_is_used_for_followup_fetches"
+ "fn gitoxide_clones_registry_with_shallow_protocol=
_and_aborts_and_updates_again"
+ "fn gitoxide_clones_registry_with_shallow_protocol=
_and_follow_up_fetch_maintains_shallowness"
+ "fn gitoxide_clones_registry_with_shallow_protocol=
_and_follow_up_with_git2_fetch"
+ "fn gitoxide_clones_registry_without_shallow_proto=
col_and_follow_up_fetch_uses_shallowness"
+ "fn gitoxide_clones_shallow_two_revs_same_deps"
+ "fn gitoxide_git_dependencies_switch_from_branch_t=
o_rev"
+ "fn gitoxide_shallow_clone_followed_by_non_shallow=
_update"
+ "fn shallow_deps_work_with_revisions_and_branches_=
mixed_on_same_dependency")))
+ (substitute* "src/tools/cargo/tests/testsuite/offline.rs=
"
+ ,@(make-ignore-test-list '("fn gitoxide_cargo_compile_=
offline_with_cached_git_dep_shallow_dep")))
+ (substitute* "src/tools/cargo/tests/testsuite/patch.rs"
+ ,@(make-ignore-test-list '("fn gitoxide_clones_shallow=
_old_git_patch")))))
(add-after 'unpack 'disable-tests-requiring-mercurial
(lambda _
(substitute*
- "src/tools/cargo/tests/testsuite/init/simple_hg_ignore_=
exists/mod.rs"
- (("fn simple_hg_ignore_exists")
- "#[ignore]\nfn simple_hg_ignore_exists"))
+ "src/tools/cargo/tests/testsuite/init/simple_hg_ignore_e=
xists/mod.rs"
+ ,@(make-ignore-test-list '("fn case")))
(substitute*
"src/tools/cargo/tests/testsuite/init/mercurial_autodet=
ect/mod.rs"
- (("fn mercurial_autodetect")
- "#[ignore]\nfn mercurial_autodetect"))))
+ ,@(make-ignore-test-list '("fn case")))
+ (substitute*
+ "src/tools/cargo/tests/testsuite/init/simple_hg/mod.rs"
+ ,@(make-ignore-test-list '("fn case")))
+ (substitute*
+ "src/tools/cargo/tests/testsuite/new.rs"
+ ,@(make-ignore-test-list '("fn simple_hg")))))
(add-after 'unpack 'disable-tests-broken-on-aarch64
(lambda _
(with-directory-excursion "src/tools/cargo/tests/testsuit=
e/"
@@ -870,7 +889,7 @@ (define-public rust
;; We skip the test since it's drastically unlikely Guix's
;; packaging will introduce a bug here.
(lambda _
- (delete-file "src/test/ui/parser/shebang/sneaky-attrib.rs=
")))
+ (delete-file "tests/ui/parser/shebang/sneaky-attrib.rs"))=
)
(add-after 'unpack 'patch-process-tests
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
@@ -903,11 +922,17 @@ (define-public rust
"gdb =3D \"" gdb "/bin/gdb\"\n"))))))
(replace 'build
;; Phase overridden to also build rustfmt.
- (lambda* (#:key parallel-build? #:allow-other-keys)
+ (lambda* (#:key parallel-build? outputs #:allow-other-keys)
(let ((job-spec (string-append
"-j" (if parallel-build?
(number->string (parallel-job-c=
ount))
"1"))))
+ ;; Append the default output's lib folder to the RUSTFL=
AGS
+ ;; environment variable. This lets programs like rustfm=
t
+ ;; that depend on rustc's shared libraries like rustfmt=
work.
+ (setenv "RUSTFLAGS"
+ (format #f "-C link-arg=3D-Wl,-rpath,~a/lib"
+ (assoc-ref outputs "out")))
(invoke "./x.py" job-spec "build"
"library/std" ;rustc
"src/tools/cargo"
--=20
2.41.0
guix-patches@HIDDEN:bug#64804; Package guix-patches.
Full text available.
Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:31 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 24 03:30:31 2023
Received: from localhost ([127.0.0.1]:41630 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qNq1X-00070n-6e
for submit <at> debbugs.gnu.org; Mon, 24 Jul 2023 03:30:31 -0400
Received: from mail-4324.protonmail.ch ([185.70.43.24]:57171)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <fries1234@HIDDEN>) id 1qNoFj-000405-Vy
for 64804 <at> debbugs.gnu.org; Mon, 24 Jul 2023 01:37:04 -0400
Date: Mon, 24 Jul 2023 05:36:47 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;
s=protonmail3; t=1690177018; x=1690436218;
bh=+wKN6cflOvIEN8I+paTXhiJmiov5k2ONELGQudQ2ja8=;
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=iIJWkVPhtgsBm7wxxhOO2RnKlY0yHf5cg8ihwWGZLkTF7Xxy+aarf09raIHFmCZ78
+P5UAdtTryjvuxQt6s1XRrOAXOZlUQBq0yjQXPA3yco4txrpj8zGwn/ePAmhFaD6ur
3Vdi4L4vGrpSgG/e8HafvoPmWNtXDFQNK2Y7JNtjZgvmI9vHdCLR99K20V0g1Nn9DJ
GHUz0wGA5Z7qG1S+ZVQkS6PqS8mljnakEOOXcuCajnT/wu6MRvMx5f96Qp0VEc9VHj
AkzFEoQIkR4pkDkAvVOamyZz+IJBlmUt0HFldS6+qyAPMblEFmY3KuCejUjzyWPLJs
rMcBIV84mJSIw==
To: 64804 <at> debbugs.gnu.org
From: Fries <fries1234@HIDDEN>
Subject: [PATCH 4/5] gnu: rust: Add make-ignore-test-list function.
Message-ID: <9eb96ab85434faded1d37f78185763cd29fbb8ef.1690176958.git.fries1234@HIDDEN>
In-Reply-To: <MZN9YR.MV79N2FVWSJD@HIDDEN>
References: <MZN9YR.MV79N2FVWSJD@HIDDEN>
Feedback-ID: 42759890:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 64804
X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400
Cc: Fries <fries1234@HIDDEN>, efraim@HIDDEN, juli@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)
A little helper function to make creating a list to ignore tests easier.
* gnu/packages/rust.scm (make-ignore-test-list): New symbol.
---
gnu/packages/rust.scm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index b65390c97c..03681d55ac 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -123,6 +123,12 @@ (define* (rust-bootstrapped-package base-rust version =
checksum)
(alist-replace "rustc-bootstrap" (list base-rust)
(package-native-inputs base-rust))))))
=20
+(define (make-ignore-test-list strs)
+ "Function to make creating a list to ignore tests a bit easier."
+ (map (lambda (str)
+ `((,str) (string-append "#[ignore]\n" ,str)))
+ strs))
+
;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's desig=
ned
;;; to be used in source form.
(define %mrustc-commit "597593aba86fa2edbea80c6e09f0b1b2a480722d")
--=20
2.41.0
guix-patches@HIDDEN:bug#64804; Package guix-patches.
Full text available.
Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:31 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 24 03:30:31 2023
Received: from localhost ([127.0.0.1]:41628 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qNq1W-00070f-2k
for submit <at> 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 <fries1234@HIDDEN>) id 1qNoFf-0003ze-J2
for 64804 <at> 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==
To: 64804 <at> debbugs.gnu.org
From: Fries <fries1234@HIDDEN>
Subject: [PATCH 3/5] gnu: rust: Add rust-1.71.
Message-ID: <c84a6fe6388515c9ab104333c79ba9c7886f9ce4.1690176958.git.fries1234@HIDDEN>
In-Reply-To: <MZN9YR.MV79N2FVWSJD@HIDDEN>
References: <MZN9YR.MV79N2FVWSJD@HIDDEN>
Feedback-ID: 42759890:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 64804
X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400
Cc: Fries <fries1234@HIDDEN>, efraim@HIDDEN, juli@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)
* 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")))))))
=20
+(define rust-1.71
+ (let ((base-rust
+ (rust-bootstrapped-package
+ rust-1.70 "1.71.0" "15jc0d13cmrh2xvpkyyvsbwgn3w4klqiwf2wlgzfp22m=
vjmy8rx6")))
+ (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 re=
placed 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 =3D )\".*\"" 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
--=20
2.41.0
guix-patches@HIDDEN:bug#64804; Package guix-patches.
Full text available.
Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 24 03:30:30 2023
Received: from localhost ([127.0.0.1]:41626 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qNq1R-00070U-S4
for submit <at> 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 <fries1234@HIDDEN>) id 1qNoFV-0003zL-RJ
for 64804 <at> 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==
To: 64804 <at> debbugs.gnu.org
From: Fries <fries1234@HIDDEN>
Subject: [PATCH 2/5] gnu: rust: Add rust-1.70.
Message-ID: <7e849ca25c4cceb184058d3a897c5462896d5695.1690176958.git.fries1234@HIDDEN>
In-Reply-To: <MZN9YR.MV79N2FVWSJD@HIDDEN>
References: <MZN9YR.MV79N2FVWSJD@HIDDEN>
Feedback-ID: 42759890:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 64804
X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400
Cc: Fries <fries1234@HIDDEN>, efraim@HIDDEN, juli@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)
* 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
guix-patches@HIDDEN:bug#64804; Package guix-patches.
Full text available.
Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 24 03:30:25 2023
Received: from localhost ([127.0.0.1]:41624 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qNq1Q-00070L-1A
for submit <at> 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 <fries1234@HIDDEN>) id 1qNoFW-0003zM-0d
for 64804 <at> 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==
To: 64804 <at> debbugs.gnu.org
From: Fries <fries1234@HIDDEN>
Subject: [PATCH 1/5] gnu: rust: Add rust-1.69.
Message-ID: <b7f63f9bb02e8794405d740444b1da04bff2a16a.1690176958.git.fries1234@HIDDEN>
In-Reply-To: <MZN9YR.MV79N2FVWSJD@HIDDEN>
References: <MZN9YR.MV79N2FVWSJD@HIDDEN>
Feedback-ID: 42759890:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.2 (/)
X-Debbugs-Envelope-To: 64804
X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400
Cc: Fries <fries1234@HIDDEN>, efraim@HIDDEN, juli@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)
* gnu/packages/rust.scm (rust-1.69): New variable.
---
gnu/packages/rust.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
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 =C2=A9 2022 Zheng Junjie <873216071@HIDDEN>
;;; Copyright =C2=A9 2022 Jim Newsome <jnewsome@HIDDEN>
;;; Copyright =C2=A9 2022 Mark H Weaver <mhw@HIDDEN>
+;;; Copyright =C2=A9 2023 Fries <fries1234@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -705,6 +706,24 @@ (define rust-1.68
(rust-bootstrapped-package
rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcw=
k"))
=20
+(define rust-1.69
+ (let ((base-rust
+ (rust-bootstrapped-package
+ rust-1.68 "1.69.0" "03zn7kx5bi5mdfsqfccj4h8gd6abm7spj0kjsfxwlv5=
dcwc9f1gv")))
+ (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
base-commit: b5af0b9c016a65bf32b06a4f118c2ed48f3a80b3
--=20
2.41.0
guix-patches@HIDDEN:bug#64804; Package guix-patches.
Full text available.
Received: (at 64804) by debbugs.gnu.org; 23 Jul 2023 20:38:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jul 23 16:38:32 2023
Received: from localhost ([127.0.0.1]:41307 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qNfqZ-0006rB-MF
for submit <at> debbugs.gnu.org; Sun, 23 Jul 2023 16:38:32 -0400
Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]:51377)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <juli@HIDDEN>) id 1qNfqW-0006qm-M0
for 64804 <at> debbugs.gnu.org; Sun, 23 Jul 2023 16:38:31 -0400
Received: by mail.gandi.net (Postfix) with ESMTPSA id 3D38DE0002;
Sun, 23 Jul 2023 20:38:20 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1;
t=1690144702; h=from:from:reply-to:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-type; bh=gKOTfBL2ur4O0KrIRsSv/mbTibfkRKIf/a3X2DoLRYc=;
b=XrCbOmaftHhyozjMrIfz4nBsKaRJiaqsdF0Qb4qhSqHbKRGWxTsyjpgFGe1wc3L0t58iLL
C1edPmA/kTuvjn1otAN+26A8oXuSFQjseO8PfsL81DSsXcy/fvaSTGd/tfyQxKHVs7Qto9
NofCAsiMmDYYm7Ma0jbzj1Iow2OSoxbZ+5nJ/0z5HXc1YUN8S1g3pimVtWfXu153EGySuf
FnNwY5DExPR1r5+WXljuMfk3N0OaHSCbBPOsCO8aomNGEXPmAwD6AfM2ntEtCSFVaH6zgW
zEo5uhYD42agYrPRK1m0QUslz0GM0uiZVeMUy8L4PcZcU+ERBIQpiNihiZXJsg==
Date: Sun, 23 Jul 2023 16:38:10 -0400
From: Juliana Sims <juli@HIDDEN>
Subject: Re: [PATCH] gnu: rust: Update to Rust 1.71.0
To: 64804 <at> debbugs.gnu.org
Message-Id: <MZN9YR.MV79N2FVWSJD@HIDDEN>
X-Mailer: geary/43.0
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
X-GND-Sasl: juli@HIDDEN
X-Spam-Score: 2.0 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Hi Fries, While I'm not a Rust packager (and therefore may
miss some stuff during review), there are a few glaring issues which stand
out for me. Also forgive the formatting; not having the message proper to
re [...]
Content analysis details: (2.0 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/,
low trust [2001:4b98:dc4:8:0:0:0:224 listed in] [list.dnswl.org]
-0.0 SPF_PASS SPF: sender matches SPF record
0.2 FREEMAIL_REPLYTO_END_DIGIT Reply-To freemail username ends in
digit
(1bbbeed9c7c6e50464bee042e8dd06e9cd62c4c2.1690094273.git.fries1234[at]protonmail.com)
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
-0.0 T_SCC_BODY_TEXT_LINE No description available.
2.5 FREEMAIL_FORGED_REPLYTO Freemail in Reply-To, but not From
X-Debbugs-Envelope-To: 64804
Cc: fries1234@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Reply-To: 1bbbeed9c7c6e50464bee042e8dd06e9cd62c4c2.1690094273.git.fries1234@HIDDEN
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.5 (-)
Hi Fries,
While I'm not a Rust packager (and therefore may miss some stuff during
review), there are a few glaring issues which stand out for me. Also
forgive the formatting; not having the message proper to reply to
complicates things.
First and foremost, Rust has 11052 reverse dependencies and this patch
would rebuild 25834 packages. This should be submitted to the
core-updates branch. I'm not sure whether this patch should be
resubmitted for it or if others can just keep this in mind when
considering merging it.
The next major thing is that this should be split into multiple
patches. Make each discrete new Rust in its own patch, for example.
Ideally, each patch would be atomic so that only a subset could be
applied and packages would still build fine. If I were doing it, I
would commit each intermediate version of Rust and bump the default
Rust version with that commit. You may also be able to get away with
adding each intermediate Rust and only bumping the version of the
default rust for the last one; others will have to weigh in. See
Contributing > Submitting Patches > Sending a Patch Series > Multiple
Patches in the manual for how to submit such a patch series if you need
it.
Make sure your commit messages match the proper style; see
https://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs
and the commit history.
There's one point where you add three new, empty lines near the
beginning of the patch. Prune those.
Where you write new modify-phases forms and new snippets, use
g-expressions.
> + [target."cfg(windows)".dependencies.windows-sys]
> + version = "0.45.0"
Shouldn't we be able to remove this altogether somehow since we're not
the target operating system?
> + ;; Rust 1.70 uses the rustix library which on Linux, it defaults to
> + ;; using outline ASM which without the cc cargo feature enabled, it
> + ;; will expect a precompiled binary library. This patch will
enable the cargo
> + ;; cc feature flag inside the fd-lock vendored Cargo.toml file,
which is the
> + ;; crate that uses rustix.
This comment is difficult to parse. Could it be reworded more clearly?
Perhaps, "Rust 1.70 adds the rustix library which uses outline ASM. The
vendored fd-lock crate uses rustix. It expects a precompiled binary
library without the "cc" Cargo feature enabled. This patch enables the
"cc" feature flag inside the vendored fd-lock Cargo.toml file."
That said, fd-lock is already packaged in Guix; the vendored version
should be avoided.
> + (("(checksum = )\".*\"" all name)
> + (string-append name "\"" ,%cargo-reference-hash "\"")))
Clever.
> + ;;; Function to make creating a list to ignore tests a bit easier.
This should probably be a docstring instead of a comment, and it should
describe what the function does - "Accept a list of strings containing
test names, and return a list of forms for skipping those tests" maybe.
> + (define (make-ignore-test-list strs)
> + (map (lambda (str)
> + (let ((ignore-string (format #f "#[ignore]\n~a" str)))
> + `((,str) ,ignore-string)))
> + strs))
A few things here. Firstly, I'm not sure that this procedure should
exist. Ideally we'd like to fix rather than ignore as many tests as
possible - although I see you're using this to rewrite existing stuff
more cleanly. Either way, break this whole function and its usage out
into a separate patch. Move it to be near other helper functions, not
in the middle of package definitions. Also perhaps make it a bit
cleaner like:
> (define (ignore-rust-tests strs)
> (map (lambda (str)
> `((,str) ,(string-append "#[ignore]\n" str))
> strs))
It's worth noting this is essentially a non-hygienic macro; maybe look
into rewriting it as a macro instead. See
https://spritely.institute/static/papers/scheme-primer.html#scheme-extensibility
for an introduction to the ideas behind macros, and
https://www.gnu.org/software/guile/manual/html_node/Macros.html -
especially
https://www.gnu.org/software/guile/manual/html_node/Syntax-Rules.html.
I've also found the (incorrectly) linked and very excellent
http://www.phyast.pitt.edu/~micheles/syntax-rules.pdf (WARNING! IS A
PDF! also available from
https://gist.github.com/jgarte/beb03e000943b7426f00b3d04ed01262
(WARNING! IS GITHUB!)) to be incredibly helpful. Ideally instead of
using `(substitutes* <file> ...)` you'd simply have some thing like
`(ignore-rust-tests <file> '(<str> <strs> ...))` which produces the
right code. Note that if you rewrite this as a macro, you won't be able
to use docstrings.
> + ;; Gitoxide tests seem to require the internet to run
> + ;; and Guix build containers don't have the internet.
You can just say, "Gitoxide tests require the network" or similar.
> - (substitute*
> -
"src/tools/cargo/tests/testsuite/init/simple_hg_ignore_exists/mod.rs"
> - (("fn simple_hg_ignore_exists")
> - "#[ignore]\nfn simple_hg_ignore_exists"))
> (substitute*
>
"src/tools/cargo/tests/testsuite/init/mercurial_autodetect/mod.rs"
> - (("fn mercurial_autodetect")
> - "#[ignore]\nfn mercurial_autodetect"))))
> + ,@(make-ignore-test-list '("fn case")))
> + (substitute*
> + "src/tools/cargo/tests/testsuite/init/simple_hg/mod.rs"
> + ,@(make-ignore-test-list '("fn case")))
> + (substitute*
> +
"src/tools/cargo/tests/testsuite/init/simple_hg_ignore_exists/mod.rs"
> + ,@(make-ignore-test-list '("fn case")))
In this code, you move down the substitute* call on
simple_hg_ignore_exists/mod.rs and add code above it. This produces a
larger diff than necessary. Avoid changing code order like this without
a good reason.
> + ;; Append the default output's lib folder to the RUSTFLAGS
> + ;; environment variable. this lets programs that depend on
> + ;; rustc's shared libraries like rustfmt work.
Minor writing stuff. Capitalize the 't' in "this;" move "like rustfmt"
to after "programs."
> + (setenv "RUSTFLAGS"
> + (format #f "-C link-arg=-Wl,-rpath,~a/lib"
> + (assoc-ref outputs "out")))
I'm not sure that this is the best way to do this. Setting build flags
in an environment variable just feels wrong. I'll let someone with more
knowledge of the domain weigh in, but I do want to mention it.
I don't think any of the rest of this review is blocking, but you may
want to consider it anyway.
I don't see "format" used in package definitions very often; I don't
know if there's some reason to oppose it, but it's worth considering
just using "string-append" instead.
Make sure this builds on architectures besides x86_64 if you can. I see
in the commit history for Rust there seem to be some issues around
aarch64 and riscv64 support in particular, so testing for those
platforms may reveal more issues.
Make sure to run "guix style" and "guix lint".
You may want to have a separate patch, either before or after your
changes, to port all of the default rust package's modify-phases to
g-expressions; "guix style -S arguments" should help there.
You'll need to wait for review from experts on the subject, and
obviously someone with commit, but this is very impressive for a first
patch. Rust has been languishing for a while and it's clearly not just
because it's not used. Well done.
- Juli
guix-patches@HIDDEN:bug#64804; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 23 Jul 2023 11:54:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jul 23 07:54:19 2023
Received: from localhost ([127.0.0.1]:38895 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qNXfF-0006Ux-I4
for submit <at> debbugs.gnu.org; Sun, 23 Jul 2023 07:54:19 -0400
Received: from lists.gnu.org ([2001:470:142::17]:45910)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <fries1234@HIDDEN>) id 1qNSk2-0000UO-Hr
for submit <at> debbugs.gnu.org; Sun, 23 Jul 2023 02:38:56 -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 <fries1234@HIDDEN>)
id 1qNSju-0001WB-7p
for guix-patches@HIDDEN; Sun, 23 Jul 2023 02:38:46 -0400
Received: from mail-4324.protonmail.ch ([185.70.43.24])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <fries1234@HIDDEN>)
id 1qNSjq-0008D3-Lt
for guix-patches@HIDDEN; Sun, 23 Jul 2023 02:38:46 -0400
Date: Sun, 23 Jul 2023 06:38:26 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;
s=protonmail3; t=1690094318; x=1690353518;
bh=k57i6xZtAI4iYRjxGcTa/3jK2fhmvvIfWXuutdIILtg=;
h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector;
b=A4AeHWG+06UeEGquwB6htOVpTI4wh2bIJgLUugkA+Rst/A/OToGgJWLQ6lg2HhAQN
/mwJeERVT7pgJuKzaxGf3L0WoxTfFIoXPIoaYJAggOLyK8fzWVoYj2dNNxjFYL/Mvl
wpqRQ8aL0+cCiE+GmE/zVvrDp0BkVDaxhd/3BjdQQ4aC81hFkIiudalC929QszM6RU
kJjlrNiCRGANJQy5cojyKLLaPV8M9tLbMtIk+0Suo6f6NDtTZKM96X6WCJCY7z6Ib7
mL22zEnmFC2/8adBgReNPOfy0bunnkxjNeaqN+c4uhiYWpV76R2DngXepzXuq2H19s
l0HwjVsj0ZckA==
To: guix-patches@HIDDEN
From: Fries <fries1234@HIDDEN>
Subject: [PATCH] gnu: rust: Update to Rust 1.71.0
Message-ID: <1bbbeed9c7c6e50464bee042e8dd06e9cd62c4c2.1690094273.git.fries1234@HIDDEN>
Feedback-ID: 42759890:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=185.70.43.24;
envelope-from=fries1234@HIDDEN; helo=mail-4324.protonmail.ch
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, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H5=0.001,
RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.2 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: this one was quite a bit of effort but i seem like i actually
got it working! the major changes that i've done is for Rust 1.70, i made
a patch that enables the cc feature flag so it would compile the outline
asm files instead of using included binary .a files which were remove [...]
Content analysis details: (1.2 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)
0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends
in digit (fries1234[at]protonmail.com)
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (fries1234[at]protonmail.com)
-0.0 T_SCC_BODY_TEXT_LINE No description available.
0.0 SPOOFED_FREEMAIL No description available.
X-Debbugs-Envelope-To: submit
X-Mailman-Approved-At: Sun, 23 Jul 2023 07:54:16 -0400
Cc: Fries <fries1234@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.2 (/)
this one was quite a bit of effort but i seem like i actually got it
working!
the major changes that i've done is for Rust 1.70, i made a patch that
enables the cc feature flag so it would compile the outline asm files
instead of using included binary .a files which were removed by guix.
i also ignored a lot more tests for Rust 1.71, mainly gitoxide tests as
they require the network and the git binary and we don't have that in
the build.
also rustfmt requires rustc's shared libraries so i set the RUSTFLAGS
environment variable to add the "out" outputs lib folder to the RUNPATH
so the rustfmt binary works!
---
.../patches/rust-1.70-fix-rustix-build.patch | 20 +++
gnu/packages/rust.scm | 137 ++++++++++++++++--
2 files changed, 141 insertions(+), 16 deletions(-)
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 0000000..a7e2003
--- /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 8e106a9..d489de9 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -16,6 +16,7 @@
;;; Copyright =C2=A9 2022 Zheng Junjie <873216071@HIDDEN>
;;; Copyright =C2=A9 2022 Jim Newsome <jnewsome@HIDDEN>
;;; Copyright =C2=A9 2022 Mark H Weaver <mhw@HIDDEN>
+;;; Copyright =C2=A9 2023 Fries <fries1234@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -122,6 +123,9 @@ (define* (rust-bootstrapped-package base-rust version c=
hecksum)
(alist-replace "rustc-bootstrap" (list base-rust)
(package-native-inputs base-rust))))))
=20
+
+
+
;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's desig=
ned
;;; to be used in source form.
(define %mrustc-commit "597593aba86fa2edbea80c6e09f0b1b2a480722d")
@@ -705,6 +709,81 @@ (define rust-1.68
(rust-bootstrapped-package
rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcw=
k"))
=20
+(define rust-1.69
+ (let ((base-rust
+ (rust-bootstrapped-package
+ rust-1.68 "1.69.0" "03zn7kx5bi5mdfsqfccj4h8gd6abm7spj0kjsfxwlv5=
dcwc9f1gv")))
+ (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)$"))))))=
)))
+
+(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 uses the rustix library which on Linux, it defaults t=
o
+ ;; using outline ASM which without the cc cargo feature enabled, i=
t
+ ;; will expect a precompiled binary library. This patch will enabl=
e the cargo
+ ;; cc feature flag inside the fd-lock vendored Cargo.toml file, wh=
ich is the
+ ;; crate that uses rustix.
+ (patches (search-patches "rust-1.70-fix-rustix-build.patch"))
+ (patch-flags '("-p1"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'build
+ (lambda* (#:key parallel-build? #:allow-other-keys)
+ (let ((job-spec (string-append
+ "-j" (if parallel-build?
+ (number->string (parallel-job-coun=
t))
+ "1"))))
+ (invoke "./x.py" job-spec "build" "--stage=3D1"
+ "library/std"
+ "src/tools/cargo")))))))))))
+
+(define rust-1.71
+ (let ((base-rust
+ (rust-bootstrapped-package
+ rust-1.70 "1.71.0" "15jc0d13cmrh2xvpkyyvsbwgn3w4klqiwf2wlgzfp22m=
vjmy8rx6")))
+ (package
+ (inherit base-rust)
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'patch-cargo-checksums
+ (lambda _
+ (substitute* '("Cargo.lock"
+ "src/bootstrap/Cargo.lock"
+ "src/tools/rust-analyzer/Cargo.lock"
+ "src/tools/cargo/Cargo.lock")
+ (("(checksum =3D )\".*\"" all name)
+ (string-append name "\"" ,%cargo-reference-hash "\""))=
)
+ (generate-all-checksums "vendor"))))))))))
+
+;;; Function to make creating a list to ignore tests a bit easier.
+(define (make-ignore-test-list strs)
+ (map (lambda (str)
+ (let ((ignore-string (format #f "#[ignore]\n~a" str)))
+ `((,str) ,ignore-string)))
+ strs))
+
;;; 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
@@ -713,7 +792,7 @@ (define rust-1.68
;;; Here we take the latest included Rust, make it public, and re-enable t=
ests
;;; and extra components such as rustfmt.
(define-public rust
- (let ((base-rust rust-1.67))
+ (let ((base-rust rust-1.71))
(package
(inherit base-rust)
(outputs (cons "rustfmt" (package-outputs base-rust)))
@@ -748,23 +827,43 @@ (define-public rust
(which "env")))))
(add-after 'unpack 'disable-tests-requiring-git
(lambda _
- (substitute* "src/tools/cargo/tests/testsuite/new.rs"
- (("fn author_prefers_cargo")
- "#[ignore]\nfn author_prefers_cargo")
- (("fn finds_author_git")
- "#[ignore]\nfn finds_author_git")
- (("fn finds_local_author_git")
- "#[ignore]\nfn finds_local_author_git"))))
+ (substitute* "src/tools/cargo/tests/testsuite/git.rs"
+ ,@(make-ignore-test-list
+ '("fn fetch_downloads_with_git2_first_then_with_gito=
xide_and_vice_versa"
+ "fn git_fetch_cli_env_clean"
+ "fn git_with_cli_force"
+ "fn use_the_cli")))
+ ;; Gitoxide tests seem to require the internet to run
+ ;; and Guix build containers don't have the internet.
+ (substitute* "src/tools/cargo/tests/testsuite/git_shallo=
w.rs"
+ ,@(make-ignore-test-list
+ '("fn gitoxide_clones_git_dependency_with_shallow_pr=
otocol_and_git2_is_used_for_followup_fetches"
+ "fn gitoxide_clones_registry_with_shallow_protocol=
_and_aborts_and_updates_again"
+ "fn gitoxide_clones_registry_with_shallow_protocol=
_and_follow_up_fetch_maintains_shallowness"
+ "fn gitoxide_clones_registry_with_shallow_protocol=
_and_follow_up_with_git2_fetch"
+ "fn gitoxide_clones_registry_without_shallow_proto=
col_and_follow_up_fetch_uses_shallowness"
+ "fn gitoxide_clones_shallow_two_revs_same_deps"
+ "fn gitoxide_git_dependencies_switch_from_branch_t=
o_rev"
+ "fn gitoxide_shallow_clone_followed_by_non_shallow=
_update"
+ "fn shallow_deps_work_with_revisions_and_branches_=
mixed_on_same_dependency")))
+ (substitute* "src/tools/cargo/tests/testsuite/offline.rs=
"
+ ,@(make-ignore-test-list '("fn gitoxide_cargo_compile_=
offline_with_cached_git_dep_shallow_dep")))
+ (substitute* "src/tools/cargo/tests/testsuite/patch.rs"
+ ,@(make-ignore-test-list '("fn gitoxide_clones_shallow=
_old_git_patch")))))
(add-after 'unpack 'disable-tests-requiring-mercurial
(lambda _
- (substitute*
- "src/tools/cargo/tests/testsuite/init/simple_hg_ignore_=
exists/mod.rs"
- (("fn simple_hg_ignore_exists")
- "#[ignore]\nfn simple_hg_ignore_exists"))
(substitute*
"src/tools/cargo/tests/testsuite/init/mercurial_autodet=
ect/mod.rs"
- (("fn mercurial_autodetect")
- "#[ignore]\nfn mercurial_autodetect"))))
+ ,@(make-ignore-test-list '("fn case")))
+ (substitute*
+ "src/tools/cargo/tests/testsuite/init/simple_hg/mod.rs"
+ ,@(make-ignore-test-list '("fn case")))
+ (substitute*
+ "src/tools/cargo/tests/testsuite/init/simple_hg_ignore_e=
xists/mod.rs"
+ ,@(make-ignore-test-list '("fn case")))
+ (substitute*
+ "src/tools/cargo/tests/testsuite/new.rs"
+ ,@(make-ignore-test-list '("fn simple_hg")))))
(add-after 'unpack 'disable-tests-broken-on-aarch64
(lambda _
(with-directory-excursion "src/tools/cargo/tests/testsuit=
e/"
@@ -807,7 +906,7 @@ (define-public rust
;; We skip the test since it's drastically unlikely Guix's
;; packaging will introduce a bug here.
(lambda _
- (delete-file "src/test/ui/parser/shebang/sneaky-attrib.rs=
")))
+ (delete-file "tests/ui/parser/shebang/sneaky-attrib.rs"))=
)
(add-after 'unpack 'patch-process-tests
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
@@ -840,11 +939,17 @@ (define-public rust
"gdb =3D \"" gdb "/bin/gdb\"\n"))))))
(replace 'build
;; Phase overridden to also build rustfmt.
- (lambda* (#:key parallel-build? #:allow-other-keys)
+ (lambda* (#:key parallel-build? outputs #:allow-other-keys)
(let ((job-spec (string-append
"-j" (if parallel-build?
(number->string (parallel-job-c=
ount))
"1"))))
+ ;; Append the default output's lib folder to the RUSTFL=
AGS
+ ;; environment variable. this lets programs that depend=
on
+ ;; rustc's shared libraries like rustfmt work.
+ (setenv "RUSTFLAGS"
+ (format #f "-C link-arg=3D-Wl,-rpath,~a/lib"
+ (assoc-ref outputs "out")))
(invoke "./x.py" job-spec "build"
"library/std" ;rustc
"src/tools/cargo"
base-commit: 00ed2901f5171e4f9435641a91678217cae38030
--=20
2.41.0
Fries <fries1234@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#64804; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.