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

gnu: magit: Update to 2.5.0. 

* gnu/packages/emacs.scm (magit): Update to 2.5.0.
[propagated-inputs]: Add 'emacs-with-editor'.
[arguments]: Make with WITH_EDITOR_DIR.
This commit is contained in:
Alex Kost 2016-02-08 16:35:24 +03:00
parent 2b0e43003c
commit 3db5ed11da
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/emacs.scm
View File

@ -377,7 +377,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.4.0") (version "2.5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -385,12 +385,14 @@ 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
"1wbam4l36061mj79qlgzrv4xbzhk2dk6gnv45610zwfnf24ikdsp")))) "0i6qpx5szzc4kyfcdhaic8gif0sqdqcya1niyj93lpvw66jcxsxa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-no-x))) ("emacs" ,emacs-no-x)))
(inputs `(("git" ,git))) (inputs `(("git" ,git)))
(propagated-inputs `(("dash" ,emacs-dash))) (propagated-inputs
`(("dash" ,emacs-dash)
("with-editor" ,emacs-with-editor)))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
@ -408,7 +410,11 @@ on stdout instead of using a socket as the Emacsclient does.")
(string-append "DASH_DIR=" (string-append "DASH_DIR="
(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 "WITH_EDITOR_DIR="
(assoc-ref %build-inputs "with-editor")
"/share/emacs/site-lisp/guix.d/with-editor-"
,(package-version emacs-with-editor)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases