From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id WHhEO+gQh2ItSgAAbAwnHQ (envelope-from ) for ; Fri, 20 May 2022 05:54:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id wMxHOugQh2IHmQAAG6o9tA (envelope-from ) for ; Fri, 20 May 2022 05:54:16 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3C54F134D5 for ; Fri, 20 May 2022 05:54:16 +0200 (CEST) Received: from localhost ([::1]:54140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrtiQ-0003nJ-9E for larch@yhetil.org; Thu, 19 May 2022 23:54:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrtiF-0003mv-0V for guix-patches@gnu.org; Thu, 19 May 2022 23:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43274) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrtiE-0000Wn-O7 for guix-patches@gnu.org; Thu, 19 May 2022 23:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrtiE-0001LR-I3 for guix-patches@gnu.org; Thu, 19 May 2022 23:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55517] Acknowledgement ([PATCH]: gnu: emacs-magit: Drop the libgit backend.) Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 May 2022 03:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55517 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 55517@debbugs.gnu.org Received: via spool by 55517-submit@debbugs.gnu.org id=B55517.16530188135131 (code B ref 55517); Fri, 20 May 2022 03:54:02 +0000 Received: (at 55517) by debbugs.gnu.org; 20 May 2022 03:53:33 +0000 Received: from localhost ([127.0.0.1]:37171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrthl-0001Kg-6u for submit@debbugs.gnu.org; Thu, 19 May 2022 23:53:33 -0400 Received: from mail-m973.mail.163.com ([123.126.97.3]:64826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrthg-0001KP-5u for 55517@debbugs.gnu.org; Thu, 19 May 2022 23:53:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=UlElh fLAEHncYc4v9shzD5S9wy9VoPhZyEtXUqk86Xw=; b=K54yFpeSc3bFZCWXrbNbX pMitrUStONbqCD2R5OeJUfK3L8CFGm05eeFSpnkkLI1bC2nv2vm5DmqRV1GeguPO U6tnPV3mxQwqx/gDfiICBEL4PfcIZUDmd3KjCy2v0SVi3X5UFYGmkW+7KbrqaEph TCbeeTolOZH92XxPM95bBI= Received: from asus-laptop (unknown [27.38.118.8]) by smtp3 (Coremail) with SMTP id G9xpCgDn_XWtEIdi8qicDg--.1002S2; Fri, 20 May 2022 11:53:19 +0800 (CST) References: <868rqykt19.fsf@163.com> <86sfp6je99.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Fri, 20 May 2022 11:52:51 +0800 In-reply-to: Message-ID: <86leuw507n.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: G9xpCgDn_XWtEIdi8qicDg--.1002S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUj18BDUUUU X-Originating-IP: [27.38.118.8] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBLw8Hr2HmmxbObgAAsi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653018856; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=UlElhfLAEHncYc4v9shzD5S9wy9VoPhZyEtXUqk86Xw=; b=JVNFxGnNMOHBK5DCxJwga+HWRbih2gWwccdPgRgmE2fqTIg3AKRqCLCX/vv/lthYuo0Ayb 1z4Xv012ZFTc974QFB17xbeRjjeYsI5eWlAaTJIYoZlOyzj7LKzIlz2Zt1oI90f7qpjeQS jVqxJ7a23SiX7gSOoKTGEbzHjBBzNbXQSAn+C4FAe9W7SKIaWWGoLakgIhfm6FNLS1C7PC Auy20cS88MlILyjfiC7yB1aDHUHROYDxUCft9czo5FytW39rR0z44RHT7xirStgI/LKL2/ 5CT1XgZ+AR33pqAtlN/27dptJbM5u3oXSAvYBXycf4o18w7KT0TpqXs14DLR1g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653018856; a=rsa-sha256; cv=none; b=YmpVbMT1ZHGJnrKThbuVfc4wzKuNKza438x19Qdu32QbDMxYXzigX58L6mZK+QGeGXGQVY fh6N5+DCC5rvsqP/DzmqBnHXZd2Osi7jbW+mggMggcJntqMsR70pOc9z9A7jRUpW+HXbVY 5c30c1KatHy7I9Z5e8NbsrtoYEfEhIY8o6WbufGWiJ3d9HNtC905BbaUGnflAZE6CgEDNF FiRCGZv+yC3VP5vWjUwFexfcCtYUpLi+yfWtZ06RaULAAjvu+WM2kgrrS8ZBfSOljTDSoZ q/LdTuCwjrmYi0n2OkaVhr6P2PoRFcewgeoOhcfC9bScPUyG1n5CTTkvbHfQ2Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=K54yFpeS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.36 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=K54yFpeS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 3C54F134D5 X-Spam-Score: 5.36 X-Migadu-Scanner: scn1.migadu.com X-TUID: 36JIZvZUk/zx --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYocQrBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/lvpAEAq9xOazY7oteVizCXnK2jEnrWB+26 RP9XEFckVpXVOPIA/34CHdNUO3OrpzeQ53ub8Bje+mkrdjyZczh9SNrZlD4N =CTG0 -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-emacs-magit-Use-G-expressions.patch >From ee433f6bfa5a1cde74deff864934a2e00bf21a0c Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 20 May 2022 11:49:10 +0800 Subject: [PATCH 1/2] gnu: emacs-magit: Use G-expressions. * gnu/packages/emacs-xyz.scm (emacs-magit)[arguments]: Use G-expressions. : In phase 'patch-exec-paths', use search-input-file for perl executable. --- gnu/packages/emacs-xyz.scm | 91 +++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eed2f4b71c..8198638c13 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -869,51 +869,52 @@ (define-public emacs-magit (base32 "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn")))) (build-system emacs-build-system) (arguments - `(#:emacs ,emacs-no-x ;module support is required - #:tests? #t - #:test-command '("make" "test") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'build-info-manual - (lambda _ - (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 "Documentation" "\\.info$")) - (chdir "lisp"))) - (add-after 'build-info-manual 'set-magit-version - (lambda _ - (make-file-writable "magit.el") - (emacs-substitute-variables "magit.el" - ("magit-version" ,version)))) - (add-after 'set-magit-version 'patch-exec-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((perl (assoc-ref inputs "perl"))) - (make-file-writable "magit-sequence.el") - (emacs-substitute-variables "magit-sequence.el" - ("magit-perl-executable" (string-append perl "/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"))) - (add-after 'configure-git 'disable-tramp-test - (lambda _ - ;; There is an issue causing TRAMP to fail in the build - ;; environment. Setting the tramp-remote-shell parameter of - ;; the sudo-method to the file name of the shell didn't help. - (chdir "..") - (substitute* "t/magit-tests.el" - (("^\\(ert-deftest magit-toplevel:tramp.*" all) - (string-append all " (skip-unless nil)"))))) - (add-before 'install 'enter-lisp-directory - (lambda _ - (chdir "lisp")))))) + (list + #:emacs emacs-no-x + #:tests? #t + #:test-command #~(list "make" "test") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'build-info-manual + (lambda _ + (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 "Documentation" "\\.info$")) + (chdir "lisp"))) + (add-after 'build-info-manual 'set-magit-version + (lambda _ + (make-file-writable "magit.el") + (emacs-substitute-variables "magit.el" + ("magit-version" #$version)))) + (add-after 'set-magit-version 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((perl (search-input-file inputs "/bin/perl"))) + (make-file-writable "magit-sequence.el") + (emacs-substitute-variables "magit-sequence.el" + ("magit-perl-executable" 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"))) + (add-after 'configure-git 'disable-tramp-test + (lambda _ + ;; There is an issue causing TRAMP to fail in the build + ;; environment. Setting the tramp-remote-shell parameter of + ;; the sudo-method to the file name of the shell didn't help. + (chdir "..") + (substitute* "t/magit-tests.el" + (("^\\(ert-deftest magit-toplevel:tramp.*" all) + (string-append all " (skip-unless nil)"))))) + (add-before 'install 'enter-lisp-directory + (lambda _ + (chdir "lisp")))))) (native-inputs (list texinfo)) (inputs -- 2.36.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-emacs-magit-Drop-the-libgit-backend.patch >From 983a23d9ae1fde345e9ad92f49dbb30e73cc8498 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 20 May 2022 11:51:02 +0800 Subject: [PATCH 2/2] gnu: emacs-magit: Drop the libgit backend. Drop the libgit backend for following reasons: 1. The libgit backend of Magitis very incomplete. There's almost no benefits, but extra maintenance efforts. 2. The libgit backend of Magit can be considered as an extra package. And it's still in Proof-Of-Concept status so its quaility doesn't satisfy the requirement of Guix package. * gnu/packages/emacs-xyz.scm (emacs-magit)[arguments] : Remove this argument. : Exclude the magit-libgit.el and magit-libgit-pkg.el. [inputs]: Remove emacs-libgit. --- gnu/packages/emacs-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8198638c13..d3ca00475e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -870,9 +870,11 @@ (define-public emacs-magit (build-system emacs-build-system) (arguments (list - #:emacs emacs-no-x #:tests? #t #:test-command #~(list "make" "test") + #:exclude #~(cons* "magit-libgit.el" + "magit-libgit-pkg.el" + %default-exclude) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'build-info-manual @@ -920,7 +922,7 @@ (define-public emacs-magit (inputs (list git perl)) (propagated-inputs - (list emacs-dash emacs-libgit emacs-transient emacs-with-editor)) + (list emacs-dash emacs-transient emacs-with-editor)) (home-page "https://magit.vc/") (synopsis "Emacs interface for the Git version control system") (description -- 2.36.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=--