From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: bug#30434: magit =?UTF-8?Q?won=E2=80=99t?= work over TRAMP Date: Fri, 16 Feb 2018 19:56:36 +0300 Message-ID: <874lmg6fgb.fsf@gmail.com> References: <87lgfyl67x.fsf@elephly.net> <87mv0e2jvm.fsf@gmail.com> <876072koq0.fsf@elephly.net> <87wozgosxx.fsf@netris.org> <871shny0a1.fsf@gmail.com> <877erfph9m.fsf@netris.org> <87po56avqn.fsf@gmail.com> <873721mhbh.fsf@netris.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emjJr-0000RM-9V for bug-guix@gnu.org; Fri, 16 Feb 2018 11:57:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emjJm-0004lK-DV for bug-guix@gnu.org; Fri, 16 Feb 2018 11:57:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39241) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emjJm-0004lB-95 for bug-guix@gnu.org; Fri, 16 Feb 2018 11:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1emjJl-0008O4-P3 for bug-guix@gnu.org; Fri, 16 Feb 2018 11:57:01 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <873721mhbh.fsf@netris.org> (Mark H. Weaver's message of "Fri, 16 Feb 2018 04:09:38 -0500") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Mark H Weaver Cc: 30434@debbugs.gnu.org --=-=-= Content-Type: text/plain Mark H Weaver (2018-02-16 04:09 -0500) wrote: > Alex Kost writes: > >> Mark H Weaver (2018-02-14 13:17 -0500) wrote: >> >>> Alex Kost writes: >>> >>>> You didn't remove "git" from the inputs. I think it is not needed now. >>> >>> I removed it on my first attempt, but the build failed. See below. >> >> Oh, right, sorry. I use my own package for magit and it dosn't require >> git input, so I thought that the original guix package also doesn't need >> it. Sorry for the confusion :-) > > How does your own magit package avoid requiring git as an input? I'd be > curious to see the diff between your package definition and ours. My version of magit is attached. Actually this problem (requiring git during compilation) was introduced occasionally in Magit 2.11.0 and was fixed soon after that, so "git" input will not be needed in the next release. If you want more details, tarsius (the maintainer of Magit) added some code to bring attention for his fundraising campaign: https://github.com/magit/magit/commit/bf71241122e1a0bf707913c87493214ceb12f588 Then he made a release (2.11.0), but that commit introduced the compilation fail if git wasn't available at compile-time. This was fixed right after the release (at the same day): https://github.com/magit/magit/commit/20ebb99a1dda085dfde99bf26d4d8a52fba51bcf Finally the campaign code was removed 2 weeks later: https://github.com/magit/magit/commit/4a9d9e59806735100b5d20a8be32defefb659a33 --=-=-= Content-Type: text/x-scheme Content-Disposition: attachment; filename=my-magit.scm (define-public my-emacs-magit (package (inherit magit) (name "my-emacs-magit") (arguments (substitute-keyword-arguments (package-arguments magit) ((#:phases phases) `(modify-phases ,phases (replace 'patch-exec-paths (lambda _ (with-directory-excursion "lisp" ;; "magit.el" calls 'magit-startup-asserts' and ;; 'magit-version' functions in the top level. I don't ;; need it at all. (emacs-batch-edit-file "magit.el" `(progn (goto-char (point-min)) (re-search-forward "(if after-init-time") (up-list -1) (kill-sexp) (basic-save-buffer))) (emacs-substitute-variables "magit-git.el" ("magit-git-executable" "git")) ;; XXX Campaign header was introduced in Magit 2.11.0 ;; and will be removed in the next release: ;; ;; https://github.com/magit/magit/commit/bf71241122e1a0bf707913c87493214ceb12f588 ;; https://github.com/magit/magit/commit/4a9d9e59806735100b5d20a8be32defefb659a33 ;; ;; Change the value of 'magit-hide-campaign-header' ;; variable since it calls 'git' during initializing. (emacs-substitute-variables "magit-status.el" ("magit-hide-campaign-header" 't)) #t))))))) (inputs '()) (synopsis (string-append (package-synopsis magit) " (without git dependency)")))) --=-=-=--