From patchwork Sat May 21 19:10:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cully X-Patchwork-Id: 39556 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 0421B27BBEB; Sat, 21 May 2022 20:12:15 +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 26EEE27BBEA for ; Sat, 21 May 2022 20:12:14 +0100 (BST) Received: from localhost ([::1]:50742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsUWL-0003kX-Aa for patchwork@mira.cbaines.net; Sat, 21 May 2022 15:12:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsUWA-0003kP-By for guix-patches@gnu.org; Sat, 21 May 2022 15:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nsUWA-0003pX-3a for guix-patches@gnu.org; Sat, 21 May 2022 15:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nsUW9-0002i9-US for guix-patches@gnu.org; Sat, 21 May 2022 15:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55081] [PATCH v2] Allow Guix root-dir overrides when working via Tramp. References: <87fsm3kc2m.fsf@ditto.jhoto.spork.org> In-Reply-To: <87fsm3kc2m.fsf@ditto.jhoto.spork.org> Resent-From: Brian Cully Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 May 2022 19:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55081@debbugs.gnu.org Cc: Brian Cully Received: via spool by 55081-submit@debbugs.gnu.org id=B55081.165316031510405 (code B ref 55081); Sat, 21 May 2022 19:12:01 +0000 Received: (at 55081) by debbugs.gnu.org; 21 May 2022 19:11:55 +0000 Received: from localhost ([127.0.0.1]:42972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsUW3-0002hl-2d for submit@debbugs.gnu.org; Sat, 21 May 2022 15:11:55 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:63597 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsUVz-0002hb-2D for 55081@debbugs.gnu.org; Sat, 21 May 2022 15:11:53 -0400 Received: from guix.jhoto.kublai.com (unknown [IPv6:2001:470:1f07:1b9:c714:ed8b:7cf4:a700]) by mail.spork.org (Postfix) with ESMTPSA id 9831B707B; Sat, 21 May 2022 15:11:48 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1653160310; bh=HHqbBQM8meiNACwIj3SUYNyz/1W3Wa+DRKGTKW06lQo=; h=From:To:Cc:Subject:Date; b=U8GSe9l47UK7sY6UhdRUyJmi+Ehaa5zL/Y6WSlfh0HB0lt3XFJDnpUUasl1lsabOa tBf4tXglw/pV4EQvuKaIxyDs8GCzRtyxYDr7p42BqvKD9mtkCKkeN3PUYKTTDmYJxb 3wYMZ+XoFDeLBf3QinLGVxuc5dDlENQhB1cqKODU= Date: Sat, 21 May 2022 15:10:24 -0400 Message-Id: <5eb3a6b7718bb1f3959afd27f051f744c9d677f6.1653160223.git.bjc@spork.org> X-Mailer: git-send-email 2.36.1 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" Reply-to: Brian Cully X-ACL-Warn: , Brian Cully via Guix-patches X-Patchwork-Original-From: Brian Cully via Guix-patches via From: Brian Cully X-getmail-retrieved-from-mailbox: Patches From: Brian Cully Add only the local part of the root directory to the guile search path. This lets you use Tramp to hack on a remote Guix checkout. --- I think my last patch was mangled by GNUS, so I'm resending it. FWIW, I've been using this for months without issue. .dir-locals.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dir-locals.el b/.dir-locals.el index 09e19223d5..3b75989133 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -29,7 +29,7 @@ ;; Hence the following "when", which might otherwise be unnecessary; ;; it prevents causing an error when root-dir-unexpanded is nil. (when root-dir-unexpanded - (let* ((root-dir (expand-file-name root-dir-unexpanded)) + (let* ((root-dir (file-local-name (expand-file-name root-dir-unexpanded))) ;; Workaround for bug https://issues.guix.gnu.org/43818. (root-dir* (directory-file-name root-dir)))