From unknown Fri Jun 20 20:07:23 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77631] [PATCH] gnu: emacs-magit: Simplify package. Resent-From: Cayetano Santos Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, csantosb@inventati.org, divya@subvertising.org, hako@ultrarare.space, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 08 Apr 2025 07:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77631 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77631@debbugs.gnu.org Cc: Cayetano Santos , Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by submit@debbugs.gnu.org id=B.17440986847311 (code B ref -1); Tue, 08 Apr 2025 07:52:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Apr 2025 07:51:24 +0000 Received: from localhost ([127.0.0.1]:58786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u23jv-0001to-U5 for submit@debbugs.gnu.org; Tue, 08 Apr 2025 03:51:24 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47156) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u23jr-0001t2-PE for submit@debbugs.gnu.org; Tue, 08 Apr 2025 03:51:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u23jc-000451-9Z for guix-patches@gnu.org; Tue, 08 Apr 2025 03:51:05 -0400 Received: from confino.investici.org ([2a11:7980:1::2:0]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u23jY-00057H-JO for guix-patches@gnu.org; Tue, 08 Apr 2025 03:51:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1744098646; bh=lKOwUj/v6HMnZzKJYN6ueFdBGUQKOCry4HOXVEOR8vE=; h=From:To:Cc:Subject:Date:From; b=EJYUY7QFUrSkjjW6CTsQNhjmyT/qp0DgK3PJT8k+iFUhFipYeW3SQq0n1Dld9LbQ1 u93gBJOP8OEJLoF9MrMNacaMpS+J/R2b/q2CV8TnHDr/ZHV9VlZGxUSPiZc+1kESVN L0A31VhD1q6okk09BqHzR9zh7Whrn2YM1BxRpohY= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4ZWytZ6HZGz11Mx; Tue, 8 Apr 2025 07:50:46 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZWytZ56MKz11Kj; Tue, 8 Apr 2025 07:50:46 +0000 (UTC) From: Cayetano Santos Date: Tue, 8 Apr 2025 09:50:21 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a11:7980:1::2:0; envelope-from=csantosb@inventati.org; helo=confino.investici.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_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * 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@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 From unknown Fri Jun 20 20:07:23 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77631] [PATCH] gnu: emacs-magit: Simplify package. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Apr 2025 11:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77631 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77631@debbugs.gnu.org Cc: Ian Eure , 77631-done@debbugs.gnu.org, Katherine Cox-Buday , Cayetano Santos , Andrew Tropin , Hilton Chain , Divya Ranjan Pattanaik , Liliana Marie Prikler X-Debbugs-Original-To: Cayetano Santos via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.174437159225758 (code B ref -1); Fri, 11 Apr 2025 11:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Apr 2025 11:39:52 +0000 Received: from localhost ([127.0.0.1]:49182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3Cjf-0006hO-Ja for submit@debbugs.gnu.org; Fri, 11 Apr 2025 07:39:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33468) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u3Cjd-0006gf-RX for submit@debbugs.gnu.org; Fri, 11 Apr 2025 07:39:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u3Cj7-0005Ji-SL for guix-patches@gnu.org; Fri, 11 Apr 2025 07:39:21 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3Cj5-0008Ok-AL for guix-patches@gnu.org; Fri, 11 Apr 2025 07:39:16 -0400 Received: from localhost (unknown [IPv6:2a02:6b67:e390:8b00::1ce5]) by mira.cbaines.net (Postfix) with ESMTPSA id 5B4C027BC49; Fri, 11 Apr 2025 12:39:13 +0100 (BST) Received: from fang (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 570a041f; Fri, 11 Apr 2025 11:39:13 +0000 (UTC) From: Christopher Baines In-Reply-To: (Cayetano Santos via Guix-patches via's message of "Tue, 8 Apr 2025 09:50:21 +0200") References: User-Agent: mu4e 1.12.9; emacs 29.4 Date: Fri, 11 Apr 2025 12:39:12 +0100 Message-ID: <87cydjudun.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cayetano Santos via Guix-patches via 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=E2=80=99s 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmf4/2BfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcMDg/+PxWiOPjJQcOdsOpYZ/nMjR7YxIl5vdG+ lFkicrEO/EladQQ9PGDC8Hq0ZCXRmo/t/LD1D95uvvAUGzXlkc7rOPQfz5Q0x3qF NT2QSMQozvcg+TWQkSAI7EEK7spx0nWumUNu1iLeEtg5BapV2FfRmkO5+nafIS3l M+t0zng8xWpqSyWgMqX71YjOz5nxpk9PUIPSr4tQXEvJX2KVlSymxxfd7MaoY0KM J3iiBBDWCs/wOj092GoepBQvITdO3Gr7h21QvCWQjfxQL+/COW3DBYhmyrB/IuSC hVF+V241Jt0GSlHMwHN+TC4Th4ZcVVHp9M9T6hIZgyM2p1TX5vts7u4Xys7DO1o7 ZPD46eTso4/x4gTAhQaUN9Aamte/W6OtJJmyPaIFA8bx3pmbn/hWvHAwZWaOEHUz rQiHmeA1pEhk/03Nr6lAZVzbNFxiBn0lk3f2Nx1RxVl1ir3kEIBRPGDS2W6nbBvP P5vQQSFBqGQdUKTqFnk0/rrqkJJeRIRv1vhN+Df+iliwOxmLL8wZrk39j9fELcvh fFrupGThfS4KPYHqCJ1E8VuG5292P3BSdd93MO+oQAR2vCoasIRzAxuWXIYgF3KR mhGcXcQGhWYEdyB4/Kv+zWHYnpmBeCysUqk8/w/lSFauwgrKTW8IdBOl+QACfbiq pSF3jujSVx4= =vOlU -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 20 20:07:23 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Cayetano Santos Subject: bug#77631: closed (Re: [bug#77631] [PATCH] gnu: emacs-magit: Simplify package.) Message-ID: References: <87cydjudun.fsf@cbaines.net> X-Gnu-PR-Message: they-closed 77631 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 77631@debbugs.gnu.org Date: Fri, 11 Apr 2025 11:40:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1744371603-25792-1" This is a multi-part message in MIME format... ------------=_1744371603-25792-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #77631: [PATCH] gnu: emacs-magit: Simplify package. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 77631@debbugs.gnu.org. --=20 77631: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D77631 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1744371603-25792-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 77631-done) by debbugs.gnu.org; 11 Apr 2025 11:39:16 +0000 Received: from localhost ([127.0.0.1]:49179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3Cj6-0006gH-3S for submit@debbugs.gnu.org; Fri, 11 Apr 2025 07:39:16 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:43773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3Cj3-0006g9-O2 for 77631-done@debbugs.gnu.org; Fri, 11 Apr 2025 07:39:14 -0400 Received: from localhost (unknown [IPv6:2a02:6b67:e390:8b00::1ce5]) by mira.cbaines.net (Postfix) with ESMTPSA id 5B4C027BC49; Fri, 11 Apr 2025 12:39:13 +0100 (BST) Received: from fang (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 570a041f; Fri, 11 Apr 2025 11:39:13 +0000 (UTC) From: Christopher Baines To: Cayetano Santos via Guix-patches via Subject: Re: [bug#77631] [PATCH] gnu: emacs-magit: Simplify package. In-Reply-To: (Cayetano Santos via Guix-patches via's message of "Tue, 8 Apr 2025 09:50:21 +0200") References: User-Agent: mu4e 1.12.9; emacs 29.4 Date: Fri, 11 Apr 2025 12:39:12 +0100 Message-ID: <87cydjudun.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 77631-done Cc: Ian Eure , 77631-done@debbugs.gnu.org, Katherine Cox-Buday , Cayetano Santos , Andrew Tropin , Hilton Chain , Divya Ranjan Pattanaik , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cayetano Santos via Guix-patches via 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=E2=80=99s 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmf4/2BfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcMDg/+PxWiOPjJQcOdsOpYZ/nMjR7YxIl5vdG+ lFkicrEO/EladQQ9PGDC8Hq0ZCXRmo/t/LD1D95uvvAUGzXlkc7rOPQfz5Q0x3qF NT2QSMQozvcg+TWQkSAI7EEK7spx0nWumUNu1iLeEtg5BapV2FfRmkO5+nafIS3l M+t0zng8xWpqSyWgMqX71YjOz5nxpk9PUIPSr4tQXEvJX2KVlSymxxfd7MaoY0KM J3iiBBDWCs/wOj092GoepBQvITdO3Gr7h21QvCWQjfxQL+/COW3DBYhmyrB/IuSC hVF+V241Jt0GSlHMwHN+TC4Th4ZcVVHp9M9T6hIZgyM2p1TX5vts7u4Xys7DO1o7 ZPD46eTso4/x4gTAhQaUN9Aamte/W6OtJJmyPaIFA8bx3pmbn/hWvHAwZWaOEHUz rQiHmeA1pEhk/03Nr6lAZVzbNFxiBn0lk3f2Nx1RxVl1ir3kEIBRPGDS2W6nbBvP P5vQQSFBqGQdUKTqFnk0/rrqkJJeRIRv1vhN+Df+iliwOxmLL8wZrk39j9fELcvh fFrupGThfS4KPYHqCJ1E8VuG5292P3BSdd93MO+oQAR2vCoasIRzAxuWXIYgF3KR mhGcXcQGhWYEdyB4/Kv+zWHYnpmBeCysUqk8/w/lSFauwgrKTW8IdBOl+QACfbiq pSF3jujSVx4= =vOlU -----END PGP SIGNATURE----- --=-=-=-- ------------=_1744371603-25792-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 8 Apr 2025 07:51:24 +0000 Received: from localhost ([127.0.0.1]:58786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u23jv-0001to-U5 for submit@debbugs.gnu.org; Tue, 08 Apr 2025 03:51:24 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47156) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u23jr-0001t2-PE for submit@debbugs.gnu.org; Tue, 08 Apr 2025 03:51:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u23jc-000451-9Z for guix-patches@gnu.org; Tue, 08 Apr 2025 03:51:05 -0400 Received: from confino.investici.org ([2a11:7980:1::2:0]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u23jY-00057H-JO for guix-patches@gnu.org; Tue, 08 Apr 2025 03:51:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1744098646; bh=lKOwUj/v6HMnZzKJYN6ueFdBGUQKOCry4HOXVEOR8vE=; h=From:To:Cc:Subject:Date:From; b=EJYUY7QFUrSkjjW6CTsQNhjmyT/qp0DgK3PJT8k+iFUhFipYeW3SQq0n1Dld9LbQ1 u93gBJOP8OEJLoF9MrMNacaMpS+J/R2b/q2CV8TnHDr/ZHV9VlZGxUSPiZc+1kESVN L0A31VhD1q6okk09BqHzR9zh7Whrn2YM1BxRpohY= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4ZWytZ6HZGz11Mx; Tue, 8 Apr 2025 07:50:46 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZWytZ56MKz11Kj; Tue, 8 Apr 2025 07:50:46 +0000 (UTC) From: Cayetano Santos To: guix-patches@gnu.org Subject: [PATCH] gnu: emacs-magit: Simplify package. Date: Tue, 8 Apr 2025 09:50:21 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a11:7980:1::2:0; envelope-from=csantosb@inventati.org; helo=confino.investici.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_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Cayetano Santos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * 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@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 ------------=_1744371603-25792-1--