bug#30434: magit won’t work over TRAMP

[Alex Kost <alezost@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1506 bytes --]

Mark H Weaver (2018-02-16 04:09 -0500) wrote:

> Alex Kost <alezost@gmail.com> writes:
>
>> Mark H Weaver (2018-02-14 13:17 -0500) wrote:
>>
>>> Alex Kost <alezost@gmail.com> 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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: my-magit.scm --]
[-- Type: text/x-scheme, Size: 1703 bytes --]

(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)"))))