X-Loop: help-debbugs@HIDDEN
Subject: [bug#70690] [PATCH] gnu: rust: install rust-analyzer-proc-macro-srv
Resent-From: Brennan Vincent <brennan@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 01 May 2024 03:49:02 +0000
Resent-Message-ID: <handler.70690.B.171453530130771 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 70690
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70690 <at> debbugs.gnu.org
Cc: Brennan Vincent <brennan@HIDDEN>, efraim@HIDDEN
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.171453530130771
(code B ref -1); Wed, 01 May 2024 03:49:02 +0000
Received: (at submit) by debbugs.gnu.org; 1 May 2024 03:48:21 +0000
Received: from localhost ([127.0.0.1]:35026 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s20xB-00080D-DO
for submit <at> debbugs.gnu.org; Tue, 30 Apr 2024 23:48:21 -0400
Received: from lists.gnu.org ([2001:470:142::17]:57516)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <brennan@HIDDEN>) id 1s20x4-0007zC-Oa
for submit <at> debbugs.gnu.org; Tue, 30 Apr 2024 23:48:20 -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 <brennan@HIDDEN>)
id 1s20wd-0004Cz-G2
for guix-patches@HIDDEN; Tue, 30 Apr 2024 23:47:47 -0400
Received: from smtp.umanwizard.com ([54.203.248.109])
by eggs.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <brennan@HIDDEN>) id 1s20wb-0001xH-OR
for guix-patches@HIDDEN; Tue, 30 Apr 2024 23:47:47 -0400
Received: from localhost ([173.56.0.190]) by smtp.umanwizard.com ;
1 May 2024 03:47:42 +0000
X-Fes-Received-For: guix-patches@HIDDEN
X-Fes-Received-From: <brennan@HIDDEN>
From: Brennan Vincent <brennan@HIDDEN>
Date: Tue, 30 Apr 2024 23:47:32 -0400
Message-ID: <20240501034732.1748656-1-brennan@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Fes-Encrypted: true
X-Fes-Ehlo-Domain: localhost
Received-SPF: pass client-ip=54.203.248.109;
envelope-from=brennan@HIDDEN; 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-Spam-Score: 0.9 (/)
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.1 (/)
* gnu/packages/rust.scm (rust): Install rust-analyzer-proc-macro-srv
rust-analyzer relies on this binary existing, and recent versions
of rust no longer install it by default.
Change-Id: I7ce59c065a35cf2592e7eb2fa57317aa9a8df675
---
gnu/packages/rust.scm | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 8cbbac53ac..24783d8aa2 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1214,7 +1214,9 @@ (define-public rust
"src/tools/cargo"
"src/tools/clippy"
"src/tools/rust-analyzer"
- "src/tools/rustfmt"))))
+ "src/tools/rust-analyzer/crates/proc-macro-srv-cli"
+ "src/tools/rustfmt"))
+ ))
(replace 'check
;; Phase overridden to also test more tools.
(lambda* (#:key tests? parallel-build? #:allow-other-keys)
@@ -1244,7 +1246,16 @@ (define-public rust
(format #f "prefix = ~s" (assoc-ref outputs "tools"))))
(invoke "./x.py" "install" "clippy")
(invoke "./x.py" "install" "rust-analyzer")
- (invoke "./x.py" "install" "rustfmt")))
+ (invoke "./x.py" "install" "rustfmt")
+ ;; ./x.py doesn't have an install target
+ ;; for the proc macro server, so we install it manually
+ (let* ((out (assoc-ref outputs "out"))
+ (platform ,(platform-rust-target
+ (lookup-platform-by-target-or-system
+ (or (%current-target-system)
+ (%current-system))))))
+ (install-file (string-append "build/" platform "/stage2-tools/" platform "/release/rust-analyzer-proc-macro-srv")
+ (string-append out "/libexec")))))
(add-after 'install 'install-rust-src
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "rust-src"))
--
2.41.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Brennan Vincent <brennan@HIDDEN> Subject: bug#70690: Acknowledgement ([PATCH] gnu: rust: install rust-analyzer-proc-macro-srv) Message-ID: <handler.70690.B.171453530130771.ack <at> debbugs.gnu.org> References: <20240501034732.1748656-1-brennan@HIDDEN> X-Gnu-PR-Message: ack 70690 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 70690 <at> debbugs.gnu.org Date: Wed, 01 May 2024 03:49:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 70690 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 70690: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D70690 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#70690] [PATCH] gnu: rust: install rust-analyzer-proc-macro-srv
Resent-From: Richard Sent <richard@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 28 Aug 2024 16:11:02 +0000
Resent-Message-ID: <handler.70690.B70690.17248614562333 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70690
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Brennan Vincent <brennan@HIDDEN>
Cc: 70690 <at> debbugs.gnu.org, efraim@HIDDEN
Received: via spool by 70690-submit <at> debbugs.gnu.org id=B70690.17248614562333
(code B ref 70690); Wed, 28 Aug 2024 16:11:02 +0000
Received: (at 70690) by debbugs.gnu.org; 28 Aug 2024 16:10:56 +0000
Received: from localhost ([127.0.0.1]:49605 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sjLG3-0000bZ-JA
for submit <at> debbugs.gnu.org; Wed, 28 Aug 2024 12:10:55 -0400
Received: from mail-108-mta211.mxroute.com ([136.175.108.211]:40095)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <richard@HIDDEN>) id 1sjLG1-0000bO-E8
for 70690 <at> debbugs.gnu.org; Wed, 28 Aug 2024 12:10:54 -0400
Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com)
(Authenticated sender: mN4UYu2MZsgR)
by mail-108-mta211.mxroute.com (ZoneMTA) with ESMTPSA id
19199c02e6f0003e01.001 for <70690 <at> debbugs.gnu.org>
(version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
Wed, 28 Aug 2024 16:09:54 +0000
X-Zone-Loop: 9add035ead112787b2a3639866dc3406d4ed74edcdb5
X-Originating-IP: [136.175.111.3]
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=freakingpenguin.com; s=x; h=Content-Type:MIME-Version:Message-ID:Date:
References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:
Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:
Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:
List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;
bh=Exp8ouZOoO6fu9JIjz8pja8H7xzXyLj9J0R38gseqak=; b=R1mab6WY1lytN/SOUN21JXMlWr
n4JDK3uwsNV0HofBaAv5b/LYxyjh1yaBsusKBAoRevARZPJPCuD5TalTpEhqbpuOOtIf4+skKjNx0
r+uMNrSSXcemXZwG2HOxEyfeoVIMk7aev4Ja8Qv9AUX3IQgRfKpqF0/gn/8sF88LF87Ql+mgH0LC0
Yz/TbtBm3redzBvzrlUaxhrAkTwDrrl5Z2OJxbJ3s/tCH6AIu2cmbCWdWcGY9vA/VRMgtmxkI1xE/
0ETj+lQlXmNtla++mwm4R4vFtz/Hkfyzl7jzNTZKv70ct/4bR0vDiReA0hA+TZns9t3R0vpGNXv1f
Ayd+nQJA==;
From: Richard Sent <richard@HIDDEN>
In-Reply-To: <20240501034732.1748656-1-brennan@HIDDEN> (Brennan
Vincent's message of "Tue, 30 Apr 2024 23:47:32 -0400")
References: <20240501034732.1748656-1-brennan@HIDDEN>
Date: Wed, 28 Aug 2024 12:09:36 -0400
Message-ID: <87bk1csk73.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Authenticated-Id: richard@HIDDEN
X-Spam-Score: 0.0 (/)
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 (-)
I tested this patch and it resolved an project error while using
rust-analyzer with Eglot. Seems good to me.
Without this patch rust-analyzer prints things like:
--8<---------------cut here---------------start------------->8---
rust-analyzer [unresolved-proc-macro]: proc macro `Parser` not expanded:
cannot find proc-macro server in sysroot /gnu/store/blah-rust-1.77.1.
--8<---------------cut here---------------end--------------->8---
--
Take it easy,
Richard Sent
Making my computer weirder one commit at a time.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.