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

gnu: magit-svn: Update to 2.2.0. 

* gnu/packages/emacs.scm (magit-svn): Update to 2.2.0.
[propagated-inputs]: Add WITH-EDITOR.
[arguments]: Add WITH-EDITOR to EMACSLOADPATH.
This commit is contained in:
Ludovic Courtès 2018-03-26 18:21:33 +02:00
parent a271096b93
commit 5ccd8f4061
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/emacs.scm
View File

@ -489,7 +489,7 @@ operations.")
(define-public magit-svn (define-public magit-svn
(package (package
(name "magit-svn") (name "magit-svn")
(version "2.1.1") (version "2.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -498,12 +498,13 @@ operations.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04y88j7q9h8xjbx5dbick6n5nr1522sn9i1znp0qwk3vjb4b5mzz")))) "1c3n377v436zaxamlsz04y1ahdhp96x1vd43zaryv4y10m02ba47"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs `(("emacs" ,emacs-minimal) (native-inputs `(("emacs" ,emacs-minimal)
("tar" ,tar) ("tar" ,tar)
("gzip" ,gzip))) ("gzip" ,gzip)))
(propagated-inputs `(("dash" ,emacs-dash) (propagated-inputs `(("dash" ,emacs-dash)
("with-editor" ,emacs-with-editor)
("magit" ,magit))) ("magit" ,magit)))
(arguments (arguments
`(#:modules ((guix build utils) `(#:modules ((guix build utils)
@ -525,6 +526,9 @@ operations.")
(dash (string-append (assoc-ref %build-inputs "dash") (dash (string-append (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)))
(with-editor (string-append (assoc-ref %build-inputs "with-editor")
"/share/emacs/site-lisp/guix.d/with-editor-"
,(package-version emacs-with-editor)))
(source (assoc-ref %build-inputs "source")) (source (assoc-ref %build-inputs "source"))
(lisp-dir (string-append %output "/share/emacs/site-lisp"))) (lisp-dir (string-append %output "/share/emacs/site-lisp")))
(setenv "PATH" PATH) (setenv "PATH" PATH)
@ -537,7 +541,7 @@ operations.")
(parameterize ((%emacs emacs)) (parameterize ((%emacs emacs))
(emacs-generate-autoloads ,name lisp-dir) (emacs-generate-autoloads ,name lisp-dir)
(setenv "EMACSLOADPATH" (setenv "EMACSLOADPATH"
(string-append ":" magit ":" dash)) (string-append ":" magit ":" dash ":" with-editor))
(emacs-batch-eval '(byte-compile-file "magit-svn.el")))))))) (emacs-batch-eval '(byte-compile-file "magit-svn.el"))))))))
(home-page "https://github.com/magit/magit-svn") (home-page "https://github.com/magit/magit-svn")
(synopsis "Git-SVN extension to Magit") (synopsis "Git-SVN extension to Magit")