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

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.
This commit is contained in:
Ludovic Courtès 2015-05-17 14:11:54 +02:00
parent 2c047b4a67
commit 7e4871ba9c
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/emacs.scm
View File

@ -277,26 +277,31 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.")
(define-public magit (define-public magit
(package (package
(name "magit") (name "magit")
(version "1.2.1") (version "1.4.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/magit/magit/releases/download/" "https://github.com/magit/magit/releases/download/"
version "/" name "-" version ".tar.gz")) version "/" name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "1in48g5l5xdc9cf2apnpgx73mqlz2njrpi1w52dgql4qxv3kg6gr")))) (base32
"0bbvz6cma5vj6qxx9v2m60zqkjwgwjrdf9kp04iacybvrcm8vcg7"))))
(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)
("git:gui" ,git "gui"))) ("git:gui" ,git "gui")))
(propagated-inputs `(("git-modes" ,git-modes)))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%gnu-build-system-modules
(guix build emacs-utils)) (guix build emacs-utils))
#:tests? #f ; no check target
#:test-target "test"
#:tests? #f ;'tests/magit-tests.el' is missing
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace (replace
@ -313,7 +318,16 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.")
(git:gui (assoc-ref inputs "git:gui"))) (git:gui (assoc-ref inputs "git:gui")))
(emacs-substitute-variables "magit.el" (emacs-substitute-variables "magit.el"
("magit-git-executable" (string-append git "/bin/git")) ("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 (add-after
'install 'post-install 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)