GNU bug report logs - #77631
[PATCH] gnu: emacs-magit: Simplify package.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Christopher Baines <mail <at> cbaines.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#77631: closed ([PATCH] gnu: emacs-magit: Simplify package.)
Date: Fri, 11 Apr 2025 11:40:03 +0000

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

Your message dated Fri, 11 Apr 2025 12:39:12 +0100
with message-id <87cydjudun.fsf <at> cbaines.net>
and subject line Re: [bug#77631] [PATCH] gnu: emacs-magit: Simplify package.
has caused the debbugs.gnu.org bug report #77631,
regarding [PATCH] gnu: emacs-magit: Simplify package.
to be marked as done.

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


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

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

From: Cayetano Santos <csantosb <at> inventati.org>
To: guix-patches <at> gnu.org
Cc: Cayetano Santos <csantosb <at> inventati.org>
Subject: [PATCH] gnu: emacs-magit: Simplify package.
Date: Tue,  8 Apr 2025 09:50:21 +0200

* gnu/packages/emacs-xyz.scm (emacs-magit): Simplify package.

These changes are based on emacs-forge package. As all magit related
packages share the same structure, let’s build them similarly.

[exclude]: Remove unexisting excludes.
[arguments]<#:phases>: Remove unnecessary configure-git phase.
[arguments]<#:phases>: Remove all unnecessary replace phases.
[arguments]<#:phases>: Add new chdir-lisp phase to operate from lisp
dir.
[arguments]<#:phases>: No need to make files writable.
[arguments]<#:phases>: Group all emacs-substitute-variables, and remove
relative path.
[test-command]: consider updated makefile path.

Change-Id: I3c2ae992faf56b9f9e7a68d1b9df430ab3b221a0
---
 gnu/packages/emacs-xyz.scm | 51 ++++++++------------------------------
 1 file changed, 10 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 81483bc0dc..1a8ff20860 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1919,10 +1919,7 @@ (define-public emacs-magit
     (arguments
      (list
       #:tests? #t
-      #:test-command #~(list "make" "test")
-      #:exclude #~(cons* "magit-libgit.el"
-                         "magit-libgit-pkg.el"
-                         %default-exclude)
+      #:test-command #~(list "make" "-C" ".." "test")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'build-info-manual
@@ -1930,48 +1927,20 @@ (define-public emacs-magit
               (invoke "make" "info")
               ;; Copy info files to the lisp directory, which acts as
               ;; the root of the project for the emacs-build-system.
-              (for-each (lambda (f)
-                          (install-file f "lisp"))
-                        (find-files "docs" "\\.info$"))))
-          (add-after 'build-info-manual 'set-magit-version
+              (rename-file "docs/magit.info" "lisp/magit.info")))
+          (add-after 'build-info-manual 'chdir-lisp
             (lambda _
-              (make-file-writable "lisp/magit.el")
-              (emacs-substitute-variables "lisp/magit.el"
-                ("magit-version" #$version))))
-          (add-after 'set-magit-version 'patch-exec-paths
+              (chdir "lisp")))
+          (add-after 'chdir-lisp 'patch-version-executables
             (lambda* (#:key inputs #:allow-other-keys)
-              (for-each make-file-writable
-                        (list "lisp/magit-git.el" "lisp/magit-sequence.el"))
-              (emacs-substitute-variables "lisp/magit-git.el"
+              (emacs-substitute-variables "magit.el"
+                ("magit-version" #$version))
+              (emacs-substitute-variables "magit-git.el"
                 ("magit-git-executable"
                  (search-input-file inputs "/bin/git")))
-              (emacs-substitute-variables "lisp/magit-sequence.el"
+              (emacs-substitute-variables "magit-sequence.el"
                 ("magit-perl-executable"
-                 (search-input-file inputs "/bin/perl")))))
-          (add-before 'check 'configure-git
-            (lambda _
-              ;; Otherwise some tests fail with error "unable to auto-detect
-              ;; email address".
-              (setenv "HOME" (getcwd))
-              (invoke "git" "config" "--global" "user.name" "toto")
-              (invoke "git" "config" "--global" "user.email"
-                      "toto <at> toto.com")))
-          (replace 'expand-load-path
-            (lambda args
-              (with-directory-excursion "lisp"
-                (apply (assoc-ref %standard-phases 'expand-load-path) args))))
-          (replace 'make-autoloads
-            (lambda args
-              (with-directory-excursion "lisp"
-                (apply (assoc-ref %standard-phases 'make-autoloads) args))))
-          (replace 'install
-            (lambda args
-              (with-directory-excursion "lisp"
-                (apply (assoc-ref %standard-phases 'install) args))))
-          (replace 'build
-            (lambda args
-              (with-directory-excursion "lisp"
-                (apply (assoc-ref %standard-phases 'build) args)))))))
+                 (search-input-file inputs "/bin/perl"))))))))
     (native-inputs
      (list texinfo))
     (inputs

base-commit: e839cd1108626a6db6c47915f0efa4ab41c6a01c
-- 
2.49.0

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

From: Christopher Baines <mail <at> cbaines.net>
To: Cayetano Santos via Guix-patches via <guix-patches <at> gnu.org>
Cc: Ian Eure <ian <at> retrospec.tv>, 77631-done <at> debbugs.gnu.org,
 Katherine Cox-Buday <cox.katherine.e+guix <at> gmail.com>,
 Cayetano Santos <csantosb <at> inventati.org>, Andrew Tropin <andrew <at> trop.in>,
 Hilton Chain <hako <at> ultrarare.space>,
 Divya Ranjan Pattanaik <divya <at> subvertising.org>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: Re: [bug#77631] [PATCH] gnu: emacs-magit: Simplify package.
Date: Fri, 11 Apr 2025 12:39:12 +0100

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

Cayetano Santos via Guix-patches via <guix-patches <at> gnu.org> writes:

> * gnu/packages/emacs-xyz.scm (emacs-magit): Simplify package.
>
> These changes are based on emacs-forge package. As all magit related
> packages share the same structure, let’s build them similarly.
>
> [exclude]: Remove unexisting excludes.
> [arguments]<#:phases>: Remove unnecessary configure-git phase.
> [arguments]<#:phases>: Remove all unnecessary replace phases.
> [arguments]<#:phases>: Add new chdir-lisp phase to operate from lisp
> dir.
> [arguments]<#:phases>: No need to make files writable.
> [arguments]<#:phases>: Group all emacs-substitute-variables, and remove
> relative path.
> [test-command]: consider updated makefile path.
>
> Change-Id: I3c2ae992faf56b9f9e7a68d1b9df430ab3b221a0
> ---
>  gnu/packages/emacs-xyz.scm | 51 ++++++++------------------------------
>  1 file changed, 10 insertions(+), 41 deletions(-)

Thanks for the patch, I've pushed this to master as
172e9a1aa1ee2ef3e557cf46a11e451aa7982983.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

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