From patchwork Wed Aug 30 19:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 53318 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 9CBC927BBEB; Wed, 30 Aug 2023 21:01:29 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 14F5527BBE2 for ; Wed, 30 Aug 2023 21:01:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbRN3-0000nt-6T; Wed, 30 Aug 2023 16:00:57 -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 1qbRN1-0000mH-Dj for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:55 -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 1qbRN1-0002bu-5T for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbRN8-0004Vw-Rk for guix-patches@gnu.org; Wed, 30 Aug 2023 16:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH v2 2/8] gnu: rust-analyzer: Fix build of version 2022-01-10. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 20:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 64720-submit@debbugs.gnu.org id=B64720.169342562717217 (code B ref 64720); Wed, 30 Aug 2023 20:01:02 +0000 Received: (at 64720) by debbugs.gnu.org; 30 Aug 2023 20:00:27 +0000 Received: from localhost ([127.0.0.1]:54147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMZ-0004Tb-7p for submit@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:27 -0400 Received: from mx1.riseup.net ([198.252.153.129]:37096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMX-0004TN-Sa for 64720@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:26 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RbZs859GlzDqJ8 for <64720@debbugs.gnu.org>; Wed, 30 Aug 2023 20:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693425612; bh=BMNN+lWztRrJBv8ac05C924jFuVe3BzmJDJa/hbmfms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NXLtU41eTxCbCS9qCyRcL87nTaSNLqvapHZX/zgtzd1UHaBiTQQUGrrY5fFbJKZZ0 9nkH0EFqRCFCG+gM0LIIP96SZI+5f37LQ6NKRyOf45g189s/c84HpM1hFSVioxFN/T p1DkUuewzc+QbqoqjQWx9lyf/LVkz4pw00+rzl98= X-Riseup-User-ID: 9A28BAC774ED44E3361D544E4B2041A8D8DFF15C08BFDFD974A9EBB0F1CE34E8 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbZs803gPzFpch; Wed, 30 Aug 2023 20:00:11 +0000 (UTC) From: Distopico Date: Wed, 30 Aug 2023 14:58:14 -0500 Message-ID: <20230830195955.16158-2-distopico@riseup.net> In-Reply-To: <20230830195955.16158-1-distopico@riseup.net> References: <20230830195955.16158-1-distopico@riseup.net> MIME-Version: 1.0 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-apps.scm (rust-analyzer): Update dependency rust-notify-5-pre.13. This fixes the build of `rust-analyzer@2022-01-10`, which required a pinned version of `rust-notify` (`rust-notify-5-pre.13`) to compile and rust >= 1.64. --- * gnu/packages/rust-apps.scm (rust-analyzer): Update dependency rust-notify-5-pre.13. This fixes the build of `rust-analyzer@2022-01-10`, which required a pinned version of `rust-notify` (`rust-notify-5-pre.13`) to compile and rust >= 1.64. gnu/packages/rust-apps.scm | 22 +++++++++++++++------- gnu/packages/rust.scm | 6 +++--- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index a291282325..8c7d8006cc 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1780,9 +1780,10 @@ (define-public rust-analyzer "1ci85bp8xwqrk8nqr8sh6yj8njgd98nhgnhaks2g00c77wwyra41")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f ; virtual manifest + `(#:rust ,rust-1.64 + #:install-source? #f ; virtual manifest #:cargo-test-flags - '("--release" "--" + '("--release" "--lib" "--tests" "--" "--skip=tests::test_version_check" ;it need rustc's version ;; FIXME: Guix's rust does not install source in ;; %out/lib/rustlib/src/rust so "can't load standard library from @@ -1793,12 +1794,19 @@ (define-public rust-analyzer "--skip=tests::sourcegen::sourcegen_assists_docs" ;need rustfmt "--skip=tests::sourcegen_ast::sourcegen_ast" ;same - "--skip=tidy::cargo_files_are_tidy" ;not needed "--skip=tidy::check_licenses" ;it runs cargo metadata "--skip=tidy::check_merge_commits" ;it runs git rev-list "--skip=tidy::check_code_formatting" ;need rustfmt as cargo fmt - "--skip=tidy::generate_grammar" ;same - "--skip=tidy::generate_assists_tests") ;same + + ;; These tests require rust <= 1.60 and too many packages + ;; has as dependency rust-serde-json-1 that use indexmap2 + ;; and it need rust >= 1.64 + "--skip=tests::list_test_macros" + "--skip=tests::test_derive_empty" + "--skip=tests::test_attr_macro" + "--skip=tests::test_fn_like_macro" + "--skip=tests::test_fn_like_macro2" + "--skip=tests::test_derive_error") #:cargo-development-inputs (("rust-arbitrary" ,rust-arbitrary-1) ("rust-derive-arbitrary" ,rust-derive-arbitrary-1) @@ -1845,7 +1853,7 @@ (define-public rust-analyzer ("rust-memmap2" ,rust-memmap2-0.5) ("rust-mimalloc" ,rust-mimalloc-0.1) ("rust-miow" ,rust-miow-0.4) - ("rust-notify" ,rust-notify-5) + ("rust-notify" ,rust-notify-5-pre.13) ("rust-object" ,rust-object-0.28) ("rust-once-cell" ,rust-once-cell-1) ("rust-parking-lot" ,rust-parking-lot-0.11) @@ -1927,7 +1935,7 @@ (define-public rust-analyzer (chdir "../..") (install-file "LICENSE-MIT" doc) (install-file "LICENSE-APACHE" doc))))))) - (native-inputs (list rust-src)) + (native-inputs (list rust-src-1.64)) (home-page "https://rust-analyzer.github.io/") (synopsis "Experimental Rust compiler front-end for IDEs") (description "Rust-analyzer is a modular compiler frontend for the Rust diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 4ee5ded5de..5cfdeffa81 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -652,7 +652,7 @@ (define rust-1.63 (rust-bootstrapped-package rust-1.62 "1.63.0" "1l4rrbzhxv88pnfq94nbyb9m6lfnjwixma3mwjkmvvs2aqlq158z")) -(define rust-1.64 +(define-public rust-1.64 (let ((base-rust (rust-bootstrapped-package rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk"))) @@ -891,10 +891,10 @@ (define-public rust `("procps" ,procps) (package-native-inputs base-rust)))))) -(define-public rust-src +(define-public rust-src-1.64 (hidden-package (package - (inherit rust) + (inherit rust-1.64) (name "rust-src") (build-system copy-build-system) (native-inputs '())