[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: magit: Update to 2.12.1.
From: |
Alex Kost |
Subject: |
02/02: gnu: magit: Update to 2.12.1. |
Date: |
Wed, 2 May 2018 12:29:16 -0400 (EDT) |
alezost pushed a commit to branch master
in repository guix.
commit f61719d110fcf74976260b2cb012dee1884df11a
Author: Alex Kost <address@hidden>
Date: Wed Apr 25 19:19:51 2018 +0300
gnu: magit: Update to 2.12.1.
* 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 c53a7f8..ae9b879 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -428,7 +428,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
@@ -436,7 +436,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)))
@@ -445,7 +445,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"
@@ -459,6 +460,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-"
@@ -474,7 +483,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.