From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ODwBHJffrGCPowAAgWs5BA (envelope-from ) for ; Tue, 25 May 2021 13:29:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gCqdF5ffrGAZYwAAbx9fmQ (envelope-from ) for ; Tue, 25 May 2021 11:29:27 +0000 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 ECB1810E3A for ; Tue, 25 May 2021 13:29:26 +0200 (CEST) Received: from localhost ([::1]:32944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llVFV-0005QU-NJ for larch@yhetil.org; Tue, 25 May 2021 07:29:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llVEA-0001xq-VU for guix-patches@gnu.org; Tue, 25 May 2021 07:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33302) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llVEA-00050D-Of for guix-patches@gnu.org; Tue, 25 May 2021 07:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1llVEA-0007Q7-L3 for guix-patches@gnu.org; Tue, 25 May 2021 07:28:02 -0400 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-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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621942167; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=f4x/F1RNfZr43n0BY3sdufG/d9iGG3Pd0oayha7BWCg=; b=tF6YZPY5BSNBl874gvvMxN7kJdKJJ87PvSQmNp6JAKdDieS0QA2QSPjpozujCuL6lf1kps /lZ/aXjACvA23NxEv8cW/d2kdTuYEvd9AP/qoGxit+hBOXTGhoqvRLXWXNLftqHa2U3on1 tCnXXOXlx8s6pz67snm1RYe0WFWOO0YLZqXzuEebKyk5ephjQ5q/+BrRbHqcFuSfv3uffn mO58m9PdhG3lbLiNZykOwEiYyfNArYJqVJd7LCyhKMZSvYaJ+SIoBN7gImnwiv4RZ19z1u yTFipyu4goTaszqbLDI0z/Ic/VN4GoW51q0EaRS683WvAjqw5qJt7S/axa6a3g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621942167; a=rsa-sha256; cv=none; b=u9lp0iw3yXLEuF7CJdM3qoP8KXMxvMVydmkOlv3pT1lyutOOSXGu/jGEvrGuWpbnW8FCga 21V9CFb/B0iqn8uNgPUI8x+8k3r7PPk4uIEi8mMZM8VZStJHsg+vyLolJjNl+hW+A7tej9 pjJNOapcyIOONeJbN9Eg908jRnUKFyjpevWn7AKS4/f6/kY5xOgfaXhzshrUrAhl3GCAlU gQ2aYYQYO2czwrGydsKdk/WrnOKTJPiy/U+xKN5vUr/eWksyl9ylUuQd0FUDI6n2x8nFfW /7NvnsLJvGtcZzO+yLWRHnxLd7Gkh/Vxh5PYgo+qdenw8UpWyTecnB5CvRBnTw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=CJzkUIvT; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=CJzkUIvT; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: ECB1810E3A X-Spam-Score: -0.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: 6c1YmvPeqjvi * 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