From: Alex Kost <alezost@gmail.com>
To: 31275@debbugs.gnu.org
Subject: [bug#31275] [PATCH 2/2] gnu: magit: Update to 2.12.1.
Date: Thu, 26 Apr 2018 23:14:21 +0300 [thread overview]
Message-ID: <20180426201421.24022-2-alezost@gmail.com> (raw)
In-Reply-To: <20180426201421.24022-1-alezost@gmail.com>
* gnu/packages/emacs.scm (magit): Update to 2.12.1.
[propagated-inputs]: Add 'emacs-ghub' and 'emacs-magit-popup'.
[arguments]: Set GHUB_DIR and MAGIT_POPUP_DIR make variables.
[home-page]: Update for the new home.
---
gnu/packages/emacs.scm | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 940707801..a46e60759 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -435,7 +435,7 @@ on stdout instead of using a socket as the Emacsclient does.")
(define-public magit
(package
(name "magit")
- (version "2.11.0")
+ (version "2.12.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -443,7 +443,7 @@ on stdout instead of using a socket as the Emacsclient does.")
version "/" name "-" version ".tar.gz"))
(sha256
(base32
- "11xly5bma9jc1jhs8fqbqrci8kz1y26yfq7dqjkqfy956wvfg6hz"))))
+ "1czzknmhzbggcv3bxl5amvfpp0zrkdwl1x05qarsq6qakvc85xy3"))))
(build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal)))
@@ -452,7 +452,8 @@ on stdout instead of using a socket as the Emacsclient does.")
("perl" ,perl)))
(propagated-inputs
`(("dash" ,emacs-dash)
- ;; XXX Add 'magit-popup' dependency for the next release (after 2.11.0).
+ ("ghub" ,emacs-ghub)
+ ("magit-popup" ,emacs-magit-popup)
("with-editor" ,emacs-with-editor)))
(arguments
`(#:test-target "test"
@@ -466,6 +467,14 @@ on stdout instead of using a socket as the Emacsclient does.")
(assoc-ref %build-inputs "dash")
"/share/emacs/site-lisp/guix.d/dash-"
,(package-version emacs-dash))
+ (string-append "GHUB_DIR="
+ (assoc-ref %build-inputs "ghub")
+ "/share/emacs/site-lisp/guix.d/ghub-"
+ ,(package-version emacs-ghub))
+ (string-append "MAGIT_POPUP_DIR="
+ (assoc-ref %build-inputs "magit-popup")
+ "/share/emacs/site-lisp/guix.d/magit-popup-"
+ ,(package-version emacs-magit-popup))
(string-append "WITH_EDITOR_DIR="
(assoc-ref %build-inputs "with-editor")
"/share/emacs/site-lisp/guix.d/with-editor-"
@@ -481,7 +490,7 @@ on stdout instead of using a socket as the Emacsclient does.")
(substitute* "lisp/magit-sequence.el"
(("perl") (string-append perl "/bin/perl")))
#t))))))
- (home-page "http://magit.github.io/")
+ (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.
--
2.15.1
next prev parent reply other threads:[~2018-04-26 20:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 20:11 [bug#31275] Update 'magit' and add 'emacs-ghub' Alex Kost
2018-04-26 20:14 ` [bug#31275] [PATCH 1/2] gnu: Add emacs-ghub Alex Kost
2018-04-26 20:14 ` Alex Kost [this message]
2018-04-28 21:23 ` [bug#31275] Update 'magit' and add 'emacs-ghub' Ludovic Courtès
2018-05-02 16:31 ` bug#31275: " Alex Kost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180426201421.24022-2-alezost@gmail.com \
--to=alezost@gmail.com \
--cc=31275@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).