GNU bug report logs - #59253
[PATCH] gnu: emacs-magit: Substitute git executable path.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#59253: closed ([PATCH] gnu: emacs-magit: Substitute git
 executable path.)
Date: Sun, 13 Nov 2022 21:56:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sun, 13 Nov 2022 22:55:48 +0100
with message-id <93a8d2f90b5b25e8bfce44b114015a50ec091ec3.camel <at> gmail.com>
and subject line Re: [bug#59253] [PATCH] gnu: emacs-magit: Substitute git executable path.
has caused the debbugs.gnu.org bug report #59253,
regarding [PATCH] gnu: emacs-magit: Substitute git executable path.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
59253: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59253
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Thiago Jung Bauermann <bauermann <at> kolabnow.com>
To: guix-patches <at> gnu.org
Cc: Thiago Jung Bauermann <bauermann <at> kolabnow.com>
Subject: [PATCH] gnu: emacs-magit: Substitute git executable path.
Date: Sun, 13 Nov 2022 18:11:11 -0300

Magit has a strong dependency on Git so it should directly reference the
git executable rather than expect it to be available in the profile or
environment.

This also fixes a build failure in emacs-forge.

* gnu/packages/emacs-xyz.scm (emacs-magit)[arguments]<#:phases>: Substitute
git path in the ‘magit-git-executable’ variable.
---
 gnu/packages/emacs-xyz.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8ff6275bad96..1406f8a715f2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -117,6 +117,7 @@
 ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27 <at> gmail.com>
 ;;; Copyright © 2022 Hilton Chain <hako <at> ultrarare.space>
 ;;; Copyright © 2022 Nicolas Graves <ngraves <at> ngraves.fr>
+;;; Copyright © 2022 Thiago Jung Bauermann <bauermann <at> kolabnow.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1031,7 +1032,11 @@ (define-public emacs-magit
                   ("magit-version" #$version))))
             (add-after 'set-magit-version 'patch-exec-paths
               (lambda* (#:key inputs #:allow-other-keys)
-                (make-file-writable "lisp/magit-sequence.el")
+                (for-each make-file-writable
+                          (list "lisp/magit-git.el" "lisp/magit-sequence.el"))
+                (emacs-substitute-variables "lisp/magit-git.el"
+                  ("magit-git-executable"
+                   (search-input-file inputs "/bin/git")))
                 (emacs-substitute-variables "lisp/magit-sequence.el"
                   ("magit-perl-executable"
                    (search-input-file inputs "/bin/perl")))))

[Message part 3 (message/rfc822, inline)]

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Thiago Jung Bauermann <bauermann <at> kolabnow.com>, 59253-done <at> debbugs.gnu.org
Subject: Re: [bug#59253] [PATCH] gnu: emacs-magit: Substitute git executable
 path.
Date: Sun, 13 Nov 2022 22:55:48 +0100

Am Sonntag, dem 13.11.2022 um 22:24 +0100 schrieb Liliana Marie
Prikler:
> Am Sonntag, dem 13.11.2022 um 18:11 -0300 schrieb Thiago Jung
> Bauermann:
> > Magit has a strong dependency on Git so it should directly
> > reference
> > the
> > git executable rather than expect it to be available in the profile
> > or
> > environment.
> > 
> > This also fixes a build failure in emacs-forge.
> > 
> > * gnu/packages/emacs-xyz.scm (emacs-magit)[arguments]<#:phases>:
> > Substitute
> > git path in the ‘magit-git-executable’ variable.
> > ---
> >  gnu/packages/emacs-xyz.scm | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> > 
> > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-
> > xyz.scm
> > index 8ff6275bad96..1406f8a715f2 100644
> > --- a/gnu/packages/emacs-xyz.scm
> > +++ b/gnu/packages/emacs-xyz.scm
> > @@ -117,6 +117,7 @@
> >  ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27 <at> gmail.com>
> >  ;;; Copyright © 2022 Hilton Chain <hako <at> ultrarare.space>
> >  ;;; Copyright © 2022 Nicolas Graves <ngraves <at> ngraves.fr>
> > +;;; Copyright © 2022 Thiago Jung Bauermann
> > <bauermann <at> kolabnow.com>
> >  ;;;
> >  ;;; This file is part of GNU Guix.
> >  ;;;
> > @@ -1031,7 +1032,11 @@ (define-public emacs-magit
> >                    ("magit-version" #$version))))
> >              (add-after 'set-magit-version 'patch-exec-paths
> >                (lambda* (#:key inputs #:allow-other-keys)
> > -                (make-file-writable "lisp/magit-sequence.el")
> > +                (for-each make-file-writable
> > +                          (list "lisp/magit-git.el" "lisp/magit-
> > sequence.el"))
> > +                (emacs-substitute-variables "lisp/magit-git.el"
> > +                  ("magit-git-executable"
> > +                   (search-input-file inputs "/bin/git")))
> >                  (emacs-substitute-variables "lisp/magit-
> > sequence.el"
> >                    ("magit-perl-executable"
> >                     (search-input-file inputs "/bin/perl")))))
> LGTM, will push once I'm done with some other stuff.
Aaaand it's done.

Previous Next

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