gnu: emacs-magit: Update to 3.3.0-0.36059e0.

83ede5a02e breaks tests in emacs-magit 3.3.0,
I asked Jonas to make a new release, but it can take quite some time
https://github.com/magit/magit/discussions/4742

* gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.3.0-0.36059e0.
[propagated-inputs]: Add emacs-compat.
[arguments]<#:phases>: Remove disable-tramp-test.
This commit is contained in:
Andrew Tropin 2022-11-09 15:15:46 +04:00
parent 8918e42de0
commit e7c1f8979a
No known key found for this signature in database
GPG key ID: 2208D20958C1DEB0

View file

@ -992,18 +992,20 @@ (define-public emacs-libgit
(license license:gpl3+))))
(define-public emacs-magit
(let ((commit "36059e0b881cb1465cb5ad0099e55e00845a8222")
(revision "0"))
(package
(name "emacs-magit")
(version "3.3.0")
(version (git-version "3.3.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/magit/magit")
(commit (string-append "v" version))))
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn"))))
(base32 "12r5z7jbqh74rb9763smh4sblswzwi41wybzcvsy0zhw2r8lpmzv"))))
(build-system emacs-build-system)
(arguments
(list
@ -1041,14 +1043,6 @@ (define-public emacs-magit
(invoke "git" "config" "--global" "user.name" "toto")
(invoke "git" "config" "--global" "user.email"
"toto@toto.com")))
(add-after 'configure-git 'disable-tramp-test
(lambda _
;; There is an issue causing TRAMP to fail in the build
;; environment. Setting the tramp-remote-shell parameter of
;; the sudo-method to the file name of the shell didn't help.
(substitute* "t/magit-tests.el"
(("^\\(ert-deftest magit-toplevel:tramp.*" all)
(string-append all " (skip-unless nil)")))))
(replace 'expand-load-path
(lambda args
(with-directory-excursion "lisp"
@ -1062,7 +1056,7 @@ (define-public emacs-magit
(inputs
(list git perl))
(propagated-inputs
(list emacs-dash emacs-with-editor))
(list emacs-dash emacs-with-editor emacs-compat))
(home-page "https://magit.vc/")
(synopsis "Emacs interface for the Git version control system")
(description
@ -1071,7 +1065,7 @@ (define-public emacs-magit
the tracked files, for example, and you can browse the history of past
changes. There is support for cherry picking, reverting, merging,
rebasing, and other common Git operations.")
(license license:gpl3+)))
(license license:gpl3+))))
(define-public emacs-magit-svn
(package