Alex Kost <alez...@gmail.com> writes:
> From 55e67d4f3867f11a77b9a91d4c3c54599846cc83 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alez...@gmail.com>
> Date: Mon, 17 Aug 2015 21:44:40 +0300
> Subject: [PATCH] gnu: magit: Update to 2.2.0.
>
> * gnu/packages/emacs.scm (magit): Update to 2.2.0.
> [inputs]: Remove 'git:gui'.
> [propagated-inputs]: Add 'dash', remove 'git-modes'.
> [arguments]: Enable tests. Add VERSION, PREFIX and DASH_DIR to
> 'make-flags'. Remove 'configure', 'augment-load-path' and
> 'post-install' phases.
[...]
> + #:make-flags
> + (list (string-append "VERSION=" ,version)
Interesting, you have to tell it what it's own version number is?
> (add-before
> 'build 'patch-exec-paths
> (lambda* (#:key inputs #:allow-other-keys)
> - (let ((git (assoc-ref inputs "git"))
> - (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"))))))
Does magit 2 no longer use 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)
> - (emacs-generate-autoloads
> - ,name (string-append (assoc-ref outputs "out")
> - "/share/emacs/site-lisp/")))))))
Are the autoloads installed by magit 2?
> + (let ((git (assoc-ref inputs "git")))
> + (emacs-substitute-variables "lisp/magit-git.el"
> + ("magit-git-executable" (string-append git
> "/bin/git")))))))))
Return #t from this phase procedure.
Otherwise, looks good to me! I haven't yet tried magit 2, but for now I
will take your word for it that we don't need magit 1 anymore. We can
always add it later if there's demand for it.
Thanks!
Mark
