diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-17 14:11:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-17 14:12:22 +0200 |
| commit | 7e4871ba9c5dcc7bfb7d293100ec65bde4b0b91c (patch) | |
| tree | e86c44e7dd863e9e370004487508a3ea0c0fe93b /gnu/packages/emacs.scm | |
| parent | 2c047b4a67553cf39a27f6ca1d1ee9c9e18ab9ca (diff) | |
| download | guix-7e4871ba9c5dcc7bfb7d293100ec65bde4b0b91c.tar guix-7e4871ba9c5dcc7bfb7d293100ec65bde4b0b91c.tar.gz | |
gnu: magit: Update to 1.4.1.
* gnu/packages/emacs.scm (magit)[source, version]: Update to 1.4.1
[propagated-inputs]: New field.
[arguments]: Add #:test-target. Add 'augment-load-path' phase.
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fda02b7867..f40e8443cf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -277,26 +277,31 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (define-public magit (package (name "magit") - (version "1.2.1") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/magit/magit/releases/download/" version "/" name "-" version ".tar.gz")) (sha256 - (base32 "1in48g5l5xdc9cf2apnpgx73mqlz2njrpi1w52dgql4qxv3kg6gr")))) + (base32 + "0bbvz6cma5vj6qxx9v2m60zqkjwgwjrdf9kp04iacybvrcm8vcg7")))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-no-x))) (inputs `(("git" ,git) ("git:gui" ,git "gui"))) + (propagated-inputs `(("git-modes" ,git-modes))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) #:imported-modules (,@%gnu-build-system-modules (guix build emacs-utils)) - #:tests? #f ; no check target + + #:test-target "test" + #:tests? #f ;'tests/magit-tests.el' is missing + #:phases (modify-phases %standard-phases (replace @@ -313,7 +318,16 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (git:gui (assoc-ref inputs "git:gui"))) (emacs-substitute-variables "magit.el" ("magit-git-executable" (string-append git "/bin/git")) - ("magit-gitk-executable" (string-append git:gui "/bin/gitk")))))) + ("magit-gitk-executable" (string-append git:gui + "/bin/gitk")))))) + (add-before + 'build 'augment-load-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Allow git-commit-mode.el & co. to be found. + (let ((git-modes (assoc-ref inputs "git-modes"))) + (setenv "EMACSLOADPATH" + (string-append ":" git-modes "/share/emacs/site-lisp")) + #t))) (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) |