From patchwork Sat Apr 23 16:17:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cully X-Patchwork-Id: 38767 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 46BA427BBEA; Sat, 23 Apr 2022 17:45:27 +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=unavailable 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 06AC327BBE9 for ; Sat, 23 Apr 2022 17:45:27 +0100 (BST) Received: from localhost ([::1]:35488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niIsw-0007CL-61 for patchwork@mira.cbaines.net; Sat, 23 Apr 2022 12:45:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niIZC-0003Um-Nx for guix-patches@gnu.org; Sat, 23 Apr 2022 12:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1niIZC-0002Ek-E1 for guix-patches@gnu.org; Sat, 23 Apr 2022 12:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1niIZC-0003mL-8z for guix-patches@gnu.org; Sat, 23 Apr 2022 12:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55081] [PATCH v1] Allow Guix root-dir overrides when working via Tramp. Resent-From: Brian Cully Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Apr 2022 16:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55081@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165073106414475 (code B ref -1); Sat, 23 Apr 2022 16:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2022 16:24:24 +0000 Received: from localhost ([127.0.0.1]:57091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niIYZ-0003lK-LR for submit@debbugs.gnu.org; Sat, 23 Apr 2022 12:24:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:40506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niITr-0003dQ-MN for submit@debbugs.gnu.org; Sat, 23 Apr 2022 12:19:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niITr-0001yo-Ht for guix-patches@gnu.org; Sat, 23 Apr 2022 12:19:31 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:63341 helo=mail.spork.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niITp-0001Qt-Of for guix-patches@gnu.org; Sat, 23 Apr 2022 12:19:31 -0400 Received: from ditto (unknown [IPv6:2001:470:1f07:1b9:8650:a942:ec5e:856b]) by mail.spork.org (Postfix) with ESMTPSA id 1E3BE49DB for ; Sat, 23 Apr 2022 12:18:45 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1650730725; bh=vP8cHiO1noIw/RzBnLxkDbF3nQqIWxX0kJD1ZAL2vIc=; h=From:To:Subject:Date; b=wvfMIY1mv6yVY1o/MkmE7xgzQfZErvdcJhjktpvYLwBZTeyaVDNoYs9/SgUUPAKMY cHruI2Mlz3tMclI4qB49+YgpCvxzojAbEngbtWHQX54+KjkOStgLMHJtsLyzto8hHQ AwPqEXZlt57YdL/aLHfk3ewroLVHQEnqWt6IsaQE= User-agent: mu4e 1.6.10; emacs 28.1 From: Brian Cully Date: Sat, 23 Apr 2022 12:17:52 -0400 Message-ID: <87fsm3kc2m.fsf@ditto.jhoto.spork.org> MIME-Version: 1.0 Received-SPF: pass client-ip=166.84.7.167; envelope-from=bjc@spork.org; helo=mail.spork.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 23 Apr 2022 12:24:22 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 23 Apr 2022 12:44:56 -0400 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" X-getmail-retrieved-from-mailbox: Patches 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. --- .dir-locals.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 8540c2d86ca535ceb188c838cf1885de6f65c94f 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)))