From patchwork Thu May 19 05:08:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 39522 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 170F827BBEB; Thu, 19 May 2022 06:10:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1BA1727BBEA for ; Thu, 19 May 2022 06:10:17 +0100 (BST) Received: from localhost ([::1]:51034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrYQS-0000MQ-7R for patchwork@mira.cbaines.net; Thu, 19 May 2022 01:10:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrYQE-0000MD-4U for guix-patches@gnu.org; Thu, 19 May 2022 01:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrYQD-0004PN-SV for guix-patches@gnu.org; Thu, 19 May 2022 01:10:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrYQD-0008Vi-LW for guix-patches@gnu.org; Thu, 19 May 2022 01:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55517] [PATCH]: gnu: emacs-magit: Drop the libgit backend. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 May 2022 05:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55517 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55517@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165293698432676 (code B ref -1); Thu, 19 May 2022 05:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 May 2022 05:09:44 +0000 Received: from localhost ([127.0.0.1]:34188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrYPr-0008Uu-VN for submit@debbugs.gnu.org; Thu, 19 May 2022 01:09:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:51136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrYPp-0008Ul-Oy for submit@debbugs.gnu.org; Thu, 19 May 2022 01:09:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrYPp-0000LS-91 for guix-patches@gnu.org; Thu, 19 May 2022 01:09:37 -0400 Received: from mail-m974.mail.163.com ([123.126.97.4]:7290) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrYPl-0004Mk-5b for guix-patches@gnu.org; Thu, 19 May 2022 01:09:35 -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=U2OU+ ir8IFhRYg7eEeh+qvukjleUynQqeS76ZAxkORQ=; b=ghhjElhDrpPeOLLiZUjR+ gcCTRzeqIlsUDTyoaJP0B8Jv/85A83qpQ828l2qlkTzOUMpY13AQ1D4Mrydmt5Cy dvdpzmRikF2UG4F1cRJa/DKxHYWlPwjrBbit46KoPAqEKGl1I8/AipBNyry48rTB ecx6G8zSTiCwwR9/cIutyc= Received: from asus-laptop (unknown [27.38.118.8]) by smtp4 (Coremail) with SMTP id HNxpCgDnCtME0YVi4XbQDA--.11765S2; Thu, 19 May 2022 13:09:24 +0800 (CST) User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Thu, 19 May 2022 13:08:41 +0800 Message-ID: <868rqykt19.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: HNxpCgDnCtME0YVi4XbQDA--.11765S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUbNVkUUUUU X-Originating-IP: [27.38.118.8] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiTwQGr1sGa-3j9QAAs- Received-SPF: pass client-ip=123.126.97.4; envelope-from=all_but_last@163.com; helo=mail-m974.mail.163.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Also see the discussions in https://issues.guix.gnu.org/55427 From 5299123e8acbfb89fb307d8bbb260501c258724a Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 19 May 2022 13:01:46 +0800 Subject: [PATCH] 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 satifised the requirement of Guix package. * gnu/packages/emacs-xyz.scm (emacs-magit)[arguments]: Use G-expressions. : Remove this argument. : Exclude the magit-libgit.el and magit-libgit-pkg.el. : In phase 'patch-exec-paths', use search-input-file for perl executable. [inputs]: Remove emacs-libgit. --- gnu/packages/emacs-xyz.scm | 95 ++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eed2f4b71c..d3ca00475e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -869,57 +869,60 @@ (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 + #: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 + (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 (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