From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UFHFDNAGimKBzgAAbAwnHQ (envelope-from ) for ; Sun, 22 May 2022 11:48:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id sAXPDNAGimJQCwAA9RJhRA (envelope-from ) for ; Sun, 22 May 2022 11:48:00 +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 D46E02A89B for ; Sun, 22 May 2022 11:47:58 +0200 (CEST) Received: from localhost ([::1]:42308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsiBp-0001vy-My for larch@yhetil.org; Sun, 22 May 2022 05:47:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsiB3-0001vA-Qb for guix-patches@gnu.org; Sun, 22 May 2022 05:47:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49766) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nsiAw-0004Zt-G7 for guix-patches@gnu.org; Sun, 22 May 2022 05:47:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nsiAw-0004ZE-Df for guix-patches@gnu.org; Sun, 22 May 2022 05:47: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: Sun, 22 May 2022 09:47: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.165321279717520 (code B ref 55517); Sun, 22 May 2022 09:47:02 +0000 Received: (at 55517) by debbugs.gnu.org; 22 May 2022 09:46:37 +0000 Received: from localhost ([127.0.0.1]:43663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsiAW-0004YW-RU for submit@debbugs.gnu.org; Sun, 22 May 2022 05:46:37 -0400 Received: from mail-m975.mail.163.com ([123.126.97.5]:9391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nsiAR-0004Xw-HY for 55517@debbugs.gnu.org; Sun, 22 May 2022 05:46:36 -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=ZzRMF EEPhC86GHto0cv1a9KJ85lmJKlt3/fVd9k1gK4=; b=YtweWfBSiKKeT+fKXzD8U In9XkY9KaheD7vylyVLLX4YTvEVmO9s+sxWTYXsqNUH/uzDGd+MQcIH0huOxAl+b uURxhQXESAuqmspzDGVWjcw1wmez0QN36CBpjr0sweskipCRGzw200mH4geWVqgP SK7E5f4GNaDL+ZnyTriQds= Received: from asus-laptop (unknown [163.125.202.234]) by smtp5 (Coremail) with SMTP id HdxpCgBH0QhqBopiYPfCDg--.12411S2; Sun, 22 May 2022 17:46:19 +0800 (CST) References: <868rqykt19.fsf@163.com> <86sfp6je99.fsf@163.com> <86leuw507n.fsf@163.com> <07286c2df8ffb434e353bdde7bf8d427e9d7d9b2.camel@ist.tugraz.at> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Sun, 22 May 2022 17:46:01 +0800 In-reply-to: <07286c2df8ffb434e353bdde7bf8d427e9d7d9b2.camel@ist.tugraz.at> Message-ID: <86o7zpaoih.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HdxpCgBH0QhqBopiYPfCDg--.12411S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUbBTYDUUUU X-Originating-IP: [163.125.202.234] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBPQsJr2AZAoMv-wAAs4 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=1653212879; 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=ZzRMFEEPhC86GHto0cv1a9KJ85lmJKlt3/fVd9k1gK4=; b=pMUPPzBZ/90LNZs0ExFyX8M4t+co2Q+/n0Lr8qvOj3+NtvhhQQHt6judaSGO6E8J4gHzgC kY4+B1wBaFD/9XEQSkZ3oIeVWDNvouLigVtUX3rsQDgFrhMNS5gapY7cm32QabIHY5Ppil +w5GU+uBc/gptWL1Irv+Rt5mCzfNbgwqH0FaJyv9JoVhTTUB6WKJ1ekC/WWlSbdsN9vRAE hQb21/6fnTecRj3GpgVWNLC96AlKL+pjVGw9GIQMdpM/dUjvE5bIiyZJ7OIwVZaH8pNsh+ Rvih7FV9sJS6syXAjWvAwDQ2Yj9vpC2VZA40mntH+L3gYlMOyreMmHQpX3piWQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653212879; a=rsa-sha256; cv=none; b=Dpp++5/sUaqPwy6wnXmChhU68GwKfmIzfkbuvL+vGEOn4ItAuMswMqBiXNlk9hROBH1fs3 kVDTFLncLgqEUC8fxKb0FJdQYLBJ2RNXjTeyu5erQ8EFvr0P0lwgDvwbzXwr5IjMhwAZhn cHrBofXUnrZ15suDi5Q9UuNi3LrDybc/cQ32c0uVzrcB5RIuH6HkFtRiQmTZXz+3ScPyy7 3kNLk4EHvGpEWeLuCPb9q5E4Y1zppQpE9dTuNT27I293pPLYY2wrb9u2fzDhWCTKizwVZW Ib4MRk/1j4wwtC4580mBWJM2QG9+qcWYAz0dw0rP+2Bf1qWl+/2loirZx/dmhg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=YtweWfBS; 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: 3.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=YtweWfBS; 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: D46E02A89B X-Spam-Score: 3.25 X-Migadu-Scanner: scn0.migadu.com X-TUID: C/GT0QLNlnqO --=-=-= 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+QUCYooGZhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/lKXwEArTGTFgl4ZwH8NSLCtE6uOVul+9gG NZ3CWhtQFFlLekkA/Aj/A9GJFvXT5m+ncvVDr87FUplp0YN8MIRSTZ3YNCQF =C94O -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-emacs-magit-Use-G-expressions.patch >From e1d5e1da9229fc317f96e75d4e07e230fa6988fe Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sun, 22 May 2022 17:43:42 +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..8970b2d350 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 ;module support is required + #: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 d2f9cc135e51cdde0623b5ffc453efa11f30a5eb 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. The libgit backend currently provides next to no features, but demands extra maintenance overhead. It is in fact not a usable backend; thus let's not use it. * 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 8970b2d350..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 ;module support is required #: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 --=-=-=--