nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Alex Kost 2018-04-25 19:19:51 +03:00
parent 0a287457d4
commit f61719d110
No known key found for this signature in database
GPG Key ID: 82460C082A0EE98F
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/emacs.scm
View File

@ -428,7 +428,7 @@ on stdout instead of using a socket as the Emacsclient does.")
(define-public magit (define-public magit
(package (package
(name "magit") (name "magit")
(version "2.11.0") (version "2.12.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -436,7 +436,7 @@ on stdout instead of using a socket as the Emacsclient does.")
version "/" name "-" version ".tar.gz")) version "/" name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"11xly5bma9jc1jhs8fqbqrci8kz1y26yfq7dqjkqfy956wvfg6hz")))) "1czzknmhzbggcv3bxl5amvfpp0zrkdwl1x05qarsq6qakvc85xy3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal))) ("emacs" ,emacs-minimal)))
@ -445,7 +445,8 @@ on stdout instead of using a socket as the Emacsclient does.")
("perl" ,perl))) ("perl" ,perl)))
(propagated-inputs (propagated-inputs
`(("dash" ,emacs-dash) `(("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))) ("with-editor" ,emacs-with-editor)))
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -459,6 +460,14 @@ on stdout instead of using a socket as the Emacsclient does.")
(assoc-ref %build-inputs "dash") (assoc-ref %build-inputs "dash")
"/share/emacs/site-lisp/guix.d/dash-" "/share/emacs/site-lisp/guix.d/dash-"
,(package-version emacs-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=" (string-append "WITH_EDITOR_DIR="
(assoc-ref %build-inputs "with-editor") (assoc-ref %build-inputs "with-editor")
"/share/emacs/site-lisp/guix.d/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" (substitute* "lisp/magit-sequence.el"
(("perl") (string-append perl "/bin/perl"))) (("perl") (string-append perl "/bin/perl")))
#t)))))) #t))))))
(home-page "http://magit.github.io/") (home-page "https://magit.vc/")
(synopsis "Emacs interface for the Git version control system") (synopsis "Emacs interface for the Git version control system")
(description (description
"With Magit, you can inspect and modify your Git repositories with Emacs. "With Magit, you can inspect and modify your Git repositories with Emacs.