From patchwork Sun Mar 24 14:27:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brennan Vincent X-Patchwork-Id: 62236 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 0B3C727BBEA; Sun, 24 Mar 2024 15:45:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,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 E638727BBE2 for ; Sun, 24 Mar 2024 15:45:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roQ2E-0003di-Nq; Sun, 24 Mar 2024 11:45:22 -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 1roQ2C-0003da-CU for guix-patches@gnu.org; Sun, 24 Mar 2024 11:45:20 -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 1roQ2C-0002G0-46 for guix-patches@gnu.org; Sun, 24 Mar 2024 11:45:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roQ2r-0000RN-Nw for guix-patches@gnu.org; Sun, 24 Mar 2024 11:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69981] [PATCH] gnu: rust: update to 1.77.0 Resent-From: Brennan Vincent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Mar 2024 15:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69981 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69981@debbugs.gnu.org Cc: Brennan Vincent , efraim@flashner.co.il X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17112951371608 (code B ref -1); Sun, 24 Mar 2024 15:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Mar 2024 15:45:37 +0000 Received: from localhost ([127.0.0.1]:39365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roQ2T-0000Pr-3h for submit@debbugs.gnu.org; Sun, 24 Mar 2024 11:45:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:50458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roQ2Q-0000PY-Ee for submit@debbugs.gnu.org; Sun, 24 Mar 2024 11:45:36 -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 1roOpS-0003qZ-NJ for guix-patches@gnu.org; Sun, 24 Mar 2024 10:28:06 -0400 Received: from smtp.umanwizard.com ([54.203.248.109]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roOpR-0001TX-1H for guix-patches@gnu.org; Sun, 24 Mar 2024 10:28:06 -0400 Received: from localhost ([70.18.6.196]) by smtp.umanwizard.com ; 24 Mar 2024 14:27:59 +0000 X-Fes-Received-For: guix-patches@gnu.org X-Fes-Received-From: From: Brennan Vincent Date: Sun, 24 Mar 2024 10:27:38 -0400 Message-ID: <20240324142738.353171-1-brennan@umanwizard.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Fes-Encrypted: true X-Fes-Ehlo-Domain: localhost Received-SPF: pass client-ip=54.203.248.109; envelope-from=brennan@umanwizard.com; helo=smtp.umanwizard.com 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust.scm (rust-1.77): New variable. * gnu/packages/rust.scm (rust): Base main rust package on rust-1.77. Change-Id: Ia4611b0ea153bce1de97e711af6d3f7396a6bf85 --- gnu/packages/rust.scm | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e4cc14d26d..fc9a003f9b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -957,6 +957,31 @@ (define-public rust-1.76 (inputs (modify-inputs (package-inputs base-rust) (replace "llvm" llvm-17)))))) +(define-public rust-1.77 + (let ((base-rust (rust-bootstrapped-package rust-1.76 "1.77.0" + "11rda8d8qj24a5mkjzj1x6x9pkvaq0zlhkgdp5b39zj5m0gwsv0d"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'no-optimized-compiler-builtins + (lambda* (#:key inputs #:allow-other-keys) + ;; Pre-1.77, the behavior was equivalent to this flag being + ;; "false" if the llvm-project submodule wasn't checked out. + ;; + ;; Now there's an explicit check, so the build fails if we don't + ;; manually disable this (given that we don't have the submodule checked out). + ;; Thus making the build behave the same as it did in 1.76 and earlier. + ;; + ;; TODO - make the build system depend on system llvm for this, so we + ;; can get the performance benefits of setting this to true? + (substitute* "config.toml" + (("\\[build\\]") + "[build] +optimized-compiler-builtins = false"))))))))))) + (define (make-ignore-test-list strs) "Function to make creating a list to ignore tests a bit easier." (map (lambda (str) @@ -971,7 +996,7 @@ (define (make-ignore-test-list strs) ;;; 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.76)) + (let ((base-rust rust-1.77)) (package (inherit base-rust) (properties (append @@ -1139,7 +1164,7 @@ (define-public rust ;; The three tests which are known to fail upstream on QEMU ;; emulation on aarch64 and riscv64 also fail on x86_64 in ;; Guix's build system. Skip them on all builds. - (substitute* "sys/unix/process/process_common/tests.rs" + (substitute* "sys/pal/unix/process/process_common/tests.rs" ;; We can't use make-ignore-test-list because we will get ;; build errors due to the double [ignore] block. (("target_arch = \"arm\"" arm)