From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: [PATCH] gnu: magit: Update to 2.2.0. Date: Sat, 22 Aug 2015 13:31:14 -0400 Message-ID: <87io87s00t.fsf@netris.org> References: <87zj1pd9rg.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTCdq-0002oH-Pr for guix-devel@gnu.org; Sat, 22 Aug 2015 13:31:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZTCdm-0005sY-Nj for guix-devel@gnu.org; Sat, 22 Aug 2015 13:31:42 -0400 Received: from world.peace.net ([50.252.239.5]:45433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTCdm-0005sS-Dm for guix-devel@gnu.org; Sat, 22 Aug 2015 13:31:38 -0400 In-Reply-To: <87zj1pd9rg.fsf@gmail.com> (Alex Kost's message of "Mon, 17 Aug 2015 21:56:19 +0300") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Alex Kost Cc: guix-devel@gnu.org Alex Kost writes: > From 55e67d4f3867f11a77b9a91d4c3c54599846cc83 Mon Sep 17 00:00:00 2001 > From: Alex Kost > 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