From unknown Mon Aug 18 11:21:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48651] [PATCH] gnu: emacs-magit: Update to 3.0.0. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 May 2021 11:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48651 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48651@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162194202428447 (code B ref -1); Tue, 25 May 2021 11:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 May 2021 11:27:04 +0000 Received: from localhost ([127.0.0.1]:44848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llVD9-0007OR-Tq for submit@debbugs.gnu.org; Tue, 25 May 2021 07:27:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:37962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llVD5-0007OH-W6 for submit@debbugs.gnu.org; Tue, 25 May 2021 07:26:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llVD4-0006lT-UV for guix-patches@gnu.org; Tue, 25 May 2021 07:26:54 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:40756 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llVD1-0004FK-FQ for guix-patches@gnu.org; Tue, 25 May 2021 07:26:54 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1621942006; bh=L2eKPI8xkBdhE1nWATAk195A/JAG+dbRXIdNAE3cJ9E=; h=From:To:Subject:Date; b=CJzkUIvTjPQKVJMWWV/VExTDEBvJw0g7d6KBENQT1s53Rxo1R/4CST97qeGOufgX/ 5d+TXSp668QzX/WQVxEVKO9RmY5t9fyfA6ejuUHex44TbXG5LY58vOzokQB3IXcw9h yo0PZGU06x+m/XQRPImHCoOLU5XvrTgr7uPZIJoo= Message-Id: Date: Tue, 25 May 2021 13:26:45 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=1.896, PDS_OTHER_BAD_TLD=1.997, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.0.0. [arguments]<#:phases>: =?UTF-8?Q?Don=E2=80=99t?= return #t, this will be redundant once the core-updates branch has been merged. --- gnu/packages/emacs-xyz.s [...] Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 1.9 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 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: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.0.0. [arguments]<#:phases>: =?UTF-8?Q?Don=E2=80=99t?= return #t, this will be redundant once the core-updates branch has been merged. --- gnu/packages/emacs-xyz.s [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.0.0. [arguments]<#:phases>: Don=E2=80=99t return #t, this will be redundant once= the core-updates branch has been merged. --- gnu/packages/emacs-xyz.scm | 156 ++++++++++++++++++------------------- 1 file changed, 74 insertions(+), 82 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 886320cc34..2e267399e3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -656,92 +656,84 @@ libgit2 bindings for Emacs, intended to boost the per= formance of Magit.") (license license:gpl3+)))) =20 (define-public emacs-magit - ;; There hasn't been an official release since 2018-11-16. - (let ((commit "7f486d47fe7042edba8d9a855a4c2c301a30bc6b") - (revision "6")) - (package - (name "emacs-magit") - (version (git-version "2.90.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/magit") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "05kyc5y5wa1p3h8j7mbgvfc4zcj998zi26lnnmksj9wnvahzxfms"))= )) - (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") - #t)) - (add-after 'build-info-manual 'set-magit-version - (lambda _ - (make-file-writable "magit.el") - (emacs-substitute-variables "magit.el" - ("magit-version" ,version)) - #t)) - (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= "))) - #t))) - (add-before 'check 'configure-git - (lambda _ - ;; Otherwise some tests fail with error "unable to auto-det= ect - ;; 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 hel= p. - (chdir "..") - (substitute* "t/magit-tests.el" - (("^\\(ert-deftest magit-toplevel:tramp.*" all) - (string-append all " (skip-unless nil)"))) - #t)) - (add-before 'install 'enter-lisp-directory - (lambda _ - (chdir "lisp") - #t))))) - (native-inputs - `(("texinfo" ,texinfo))) - (inputs - `(("git" ,git) - ("perl" ,perl))) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-libgit" ,emacs-libgit) - ("emacs-transient" ,emacs-transient) - ("emacs-with-editor" ,emacs-with-editor))) - (home-page "https://magit.vc/") - (synopsis "Emacs interface for the Git version control system") - (description - "With Magit, you can inspect and modify your Git repositories + (package + (name "emacs-magit") + (version "3.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m")))) + (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")))))) + (native-inputs + `(("texinfo" ,texinfo))) + (inputs + `(("git" ,git) + ("perl" ,perl))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-libgit" ,emacs-libgit) + ("emacs-transient" ,emacs-transient) + ("emacs-with-editor" ,emacs-with-editor))) + (home-page "https://magit.vc/") + (synopsis "Emacs interface for the Git version control system") + (description + "With Magit, you can inspect and modify your Git repositories with Emacs. You can review and commit the changes you have made to the tracked files, for example, and you can browse the history of past changes. There is support for cherry picking, reverting, merging, rebasing, and other common Git operations.") - (license license:gpl3+)))) + (license license:gpl3+))) =20 (define-public emacs-magit-svn (let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f")) base-commit: a154048d980ada9b7dcc35e35cbe75056a0cd756 --=20 2.31.1 From unknown Mon Aug 18 11:21:29 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: Xinglu Chen Subject: bug#48651: closed (Re: [bug#48651] [PATCH] gnu: emacs-magit: Update to 3.0.0.) Message-ID: References: <87cztdirr6.fsf@nicolasgoaziou.fr> X-Gnu-PR-Message: they-closed 48651 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 48651@debbugs.gnu.org Date: Wed, 26 May 2021 12:51:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1622033462-12509-1" This is a multi-part message in MIME format... ------------=_1622033462-12509-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #48651: [PATCH] gnu: emacs-magit: Update to 3.0.0. 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 48651@debbugs.gnu.org. --=20 48651: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D48651 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1622033462-12509-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 48651-done) by debbugs.gnu.org; 26 May 2021 12:50:17 +0000 Received: from localhost ([127.0.0.1]:47849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llszJ-0003EK-EK for submit@debbugs.gnu.org; Wed, 26 May 2021 08:50:17 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:40139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llszH-0003E2-Qu for 48651-done@debbugs.gnu.org; Wed, 26 May 2021 08:50:16 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 26C20FF80F; Wed, 26 May 2021 12:50:07 +0000 (UTC) From: Nicolas Goaziou To: Xinglu Chen Subject: Re: [bug#48651] [PATCH] gnu: emacs-magit: Update to 3.0.0. References: Date: Wed, 26 May 2021 14:50:05 +0200 In-Reply-To: (Xinglu Chen's message of "Tue, 25 May 2021 13:26:45 +0200") Message-ID: <87cztdirr6.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, Xinglu Chen writes: > * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.0.0. > [arguments]<#:phases>: Don’t return #t, this will be redundant once the > core-updates branch has been merged. Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.199 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.199 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 48651-done Cc: 48651-done@debbugs.gnu.org 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.3 (/) Hello, Xinglu Chen writes: > * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.0.0. > [arguments]<#:phases>: Don=E2=80=99t return #t, this will be redundant on= ce the > core-updates branch has been merged. Applied. Thank you. Regards, --=20 Nicolas Goaziou ------------=_1622033462-12509-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 May 2021 11:27:04 +0000 Received: from localhost ([127.0.0.1]:44848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llVD9-0007OR-Tq for submit@debbugs.gnu.org; Tue, 25 May 2021 07:27:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:37962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llVD5-0007OH-W6 for submit@debbugs.gnu.org; Tue, 25 May 2021 07:26:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llVD4-0006lT-UV for guix-patches@gnu.org; Tue, 25 May 2021 07:26:54 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:40756 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llVD1-0004FK-FQ for guix-patches@gnu.org; Tue, 25 May 2021 07:26:54 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1621942006; bh=L2eKPI8xkBdhE1nWATAk195A/JAG+dbRXIdNAE3cJ9E=; h=From:To:Subject:Date; b=CJzkUIvTjPQKVJMWWV/VExTDEBvJw0g7d6KBENQT1s53Rxo1R/4CST97qeGOufgX/ 5d+TXSp668QzX/WQVxEVKO9RmY5t9fyfA6ejuUHex44TbXG5LY58vOzokQB3IXcw9h yo0PZGU06x+m/XQRPImHCoOLU5XvrTgr7uPZIJoo= To: guix-patches@gnu.org Subject: [PATCH] gnu: emacs-magit: Update to 3.0.0. Message-Id: Date: Tue, 25 May 2021 13:26:45 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 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, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=1.896, PDS_OTHER_BAD_TLD=1.997, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.0.0. [arguments]<#:phases>: Don’t return #t, this will be redundant once the core-updates branch has been merged. --- gnu/packages/emacs-xyz.s [...] Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 1.9 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: submit 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: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.0.0. [arguments]<#:phases>: Don’t return #t, this will be redundant once the core-updates branch has been merged. --- gnu/packages/emacs-xyz.s [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.0.0. [arguments]<#:phases>: Don=E2=80=99t return #t, this will be redundant once= the core-updates branch has been merged. --- gnu/packages/emacs-xyz.scm | 156 ++++++++++++++++++------------------- 1 file changed, 74 insertions(+), 82 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 886320cc34..2e267399e3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -656,92 +656,84 @@ libgit2 bindings for Emacs, intended to boost the per= formance of Magit.") (license license:gpl3+)))) =20 (define-public emacs-magit - ;; There hasn't been an official release since 2018-11-16. - (let ((commit "7f486d47fe7042edba8d9a855a4c2c301a30bc6b") - (revision "6")) - (package - (name "emacs-magit") - (version (git-version "2.90.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/magit") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "05kyc5y5wa1p3h8j7mbgvfc4zcj998zi26lnnmksj9wnvahzxfms"))= )) - (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") - #t)) - (add-after 'build-info-manual 'set-magit-version - (lambda _ - (make-file-writable "magit.el") - (emacs-substitute-variables "magit.el" - ("magit-version" ,version)) - #t)) - (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= "))) - #t))) - (add-before 'check 'configure-git - (lambda _ - ;; Otherwise some tests fail with error "unable to auto-det= ect - ;; 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 hel= p. - (chdir "..") - (substitute* "t/magit-tests.el" - (("^\\(ert-deftest magit-toplevel:tramp.*" all) - (string-append all " (skip-unless nil)"))) - #t)) - (add-before 'install 'enter-lisp-directory - (lambda _ - (chdir "lisp") - #t))))) - (native-inputs - `(("texinfo" ,texinfo))) - (inputs - `(("git" ,git) - ("perl" ,perl))) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-libgit" ,emacs-libgit) - ("emacs-transient" ,emacs-transient) - ("emacs-with-editor" ,emacs-with-editor))) - (home-page "https://magit.vc/") - (synopsis "Emacs interface for the Git version control system") - (description - "With Magit, you can inspect and modify your Git repositories + (package + (name "emacs-magit") + (version "3.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m")))) + (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")))))) + (native-inputs + `(("texinfo" ,texinfo))) + (inputs + `(("git" ,git) + ("perl" ,perl))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-libgit" ,emacs-libgit) + ("emacs-transient" ,emacs-transient) + ("emacs-with-editor" ,emacs-with-editor))) + (home-page "https://magit.vc/") + (synopsis "Emacs interface for the Git version control system") + (description + "With Magit, you can inspect and modify your Git repositories with Emacs. You can review and commit the changes you have made to the tracked files, for example, and you can browse the history of past changes. There is support for cherry picking, reverting, merging, rebasing, and other common Git operations.") - (license license:gpl3+)))) + (license license:gpl3+))) =20 (define-public emacs-magit-svn (let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f")) base-commit: a154048d980ada9b7dcc35e35cbe75056a0cd756 --=20 2.31.1 ------------=_1622033462-12509-1--