GNU bug report logs - #77034
[PATCH 0/2] gnu: emacs-minimal: Adjust Guix paths in snippet.

Previous Next

To reply to this bug, email your comments to 77034 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: guix-patches <at> gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH 0/2] gnu: emacs-minimal: Adjust Guix paths in snippet.
Date: Sat, 15 Mar 2025 21:04:02 +0800

Hi Guix,

The first patch makes emacs-next packages to inherit snippet from
emacs-minimal, mainly for ‘tramp-remote-path’.

The second patch adjusts paths used in snippet (adds /run/privileged/bin and
Guix Home paths), this will trigger a world-rebuild of Emacs packages.

Thanks


Hilton Chain (2):
  gnu: emacs-next-minimal: Inherit snippet from emacs-minimal.
  gnu: emacs-minimal: Adjust Guix paths in snippet.

 gnu/packages/emacs.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)


base-commit: 3cc51c3e7447ab4f590d530fa66f65b6152ab109
--
2.48.1

Message #8 received at 77034 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: 77034 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH 1/2] gnu: emacs-next-minimal: Inherit snippet from
 emacs-minimal.
Date: Sat, 15 Mar 2025 21:07:12 +0800

* gnu/packages/emacs.scm (emacs-next-minimal)[source]: Inherit emacs-minimal
source.

Change-Id: I9ace8c496106a17b5aa21356f5b92f5817979bda
---
 gnu/packages/emacs.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c5e671c6a9..32733f7b35 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -581,6 +581,7 @@ (define-public emacs-next-minimal
     (version (git-version "30.0.92" revision commit))
     (source
      (origin
+       (inherit (package-source emacs-minimal))
        (method git-fetch)
        (uri (git-reference
              (url "https://git.savannah.gnu.org/git/emacs.git")
-- 
2.48.1

Message #11 received at 77034 <at> debbugs.gnu.org (full text, mbox):

From: Hilton Chain <hako <at> ultrarare.space>
To: 77034 <at> debbugs.gnu.org
Cc: Hilton Chain <hako <at> ultrarare.space>
Subject: [PATCH 2/2] gnu: emacs-minimal: Adjust Guix paths in snippet.
Date: Sat, 15 Mar 2025 21:07:13 +0800

* gnu/packages/emacs.scm (emacs-minimal)[source]: Add "/run/privileged/bin"
and Guix Home paths to ‘tramp-remote-path’.
Add Guix Home path to ‘Man-header-file-path’.

Change-Id: I20536ae93c74e06eafa5fd26a1b421680c177102
---
 gnu/packages/emacs.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 32733f7b35..eb863110c0 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -135,10 +135,13 @@ (define-public emacs-minimal
                   (substitute* "net/tramp.el"
                     ;; Patch the line after "(defcustom tramp-remote-path".
                     (("\\(tramp-default-remote-path")
-                     (format #f "(tramp-default-remote-path ~s ~s ~s ~s "
-                             "~/.guix-profile/bin" "~/.guix-profile/sbin"
-                             "/run/current-system/profile/bin"
-                             "/run/current-system/profile/sbin")))
+                     (format
+                      #f "(tramp-default-remote-path ~s ~s ~s ~s ~s ~s ~s "
+                      "/run/privileged/bin"
+                      "~/.guix-profile/bin" "~/.guix-profile/sbin"
+                      "~/.guix-home/bin" "~/.guix-home/sbin"
+                      "/run/current-system/profile/bin"
+                      "/run/current-system/profile/sbin")))
 
                   ;; Make sure Man looks for C header files in the right
                   ;; places.
@@ -147,7 +150,8 @@ (define-public emacs-minimal
                      (string-join
                       (list line
                             "\"~/.guix-profile/include\""
-                            "\"/var/guix/profiles/system/profile/include\"")
+                            "\"~/.guix-home/include\""
+                            "\"/run/current-system/profile/include\"")
                       " ")))))))
     (build-system gnu-build-system)
     (arguments
-- 
2.48.1

Message #14 received at 77034 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Hilton Chain <hako <at> ultrarare.space>, 77034 <at> debbugs.gnu.org
Cc: Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>,
 Ian Eure <ian <at> retrospec.tv>, Cayetano Santos <csantosb <at> inventati.org>,
 Divya Ranjan Pattanaik <divya <at> subvertising.org>,
 Andrew Tropin <andrew <at> trop.in>
Subject: Re: [bug#77034] [PATCH 0/2] gnu: emacs-minimal: Adjust Guix paths
 in snippet.
Date: Sat, 15 Mar 2025 20:32:09 +0100

Am Samstag, dem 15.03.2025 um 21:04 +0800 schrieb Hilton Chain:
> Hi Guix,
> 
> The first patch makes emacs-next packages to inherit snippet from
> emacs-minimal, mainly for ‘tramp-remote-path’.
> 
> The second patch adjusts paths used in snippet (adds
> /run/privileged/bin and Guix Home paths), this will trigger a world-
> rebuild of Emacs
> packages.
> 
> Thanks
> 
> 
> Hilton Chain (2):
>   gnu: emacs-next-minimal: Inherit snippet from emacs-minimal.
>   gnu: emacs-minimal: Adjust Guix paths in snippet.
Remember to tag this as [emacs-team].

It LGTM so far, but I'm leaving it up for now in case someone else has
comments to add.

Cheers

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.