ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-21 02:03:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-magit: Update to 3.0.0.

Browse source 
* gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.0.0.
[arguments]<#:phases>: Don’t return #t, this will be redundant once the
core-updates branch has been merged.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
This commit is contained in:
Xinglu Chen 2021-05-25 13:26:45 +02:00 committed by Nicolas Goaziou
parent 93a5505f12
commit a5c9843cfe
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 74 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/emacs-xyz.scm
View file

@ -656,21 +656,18 @@ (define-public emacs-libgit
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-magit (define-public emacs-magit
;; There hasn't been an official release since 2018-11-16.
(let ((commit "7f486d47fe7042edba8d9a855a4c2c301a30bc6b")
(revision "6"))
(package (package
(name "emacs-magit") (name "emacs-magit")
(version (git-version "2.90.1" revision commit)) (version "3.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/magit/magit") (url "https://github.com/magit/magit")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "05kyc5y5wa1p3h8j7mbgvfc4zcj998zi26lnnmksj9wnvahzxfms")))) (base32 "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:emacs ,emacs-no-x ;module support is required `(#:emacs ,emacs-no-x ;module support is required
@ -686,21 +683,18 @@ (define-public emacs-magit
(for-each (lambda (f) (for-each (lambda (f)
(install-file f "lisp")) (install-file f "lisp"))
(find-files "Documentation" "\\.info$")) (find-files "Documentation" "\\.info$"))
(chdir "lisp") (chdir "lisp")))
#t))
(add-after 'build-info-manual 'set-magit-version (add-after 'build-info-manual 'set-magit-version
(lambda _ (lambda _
(make-file-writable "magit.el") (make-file-writable "magit.el")
(emacs-substitute-variables "magit.el" (emacs-substitute-variables "magit.el"
("magit-version" ,version)) ("magit-version" ,version))))
#t))
(add-after 'set-magit-version 'patch-exec-paths (add-after 'set-magit-version 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((perl (assoc-ref inputs "perl"))) (let ((perl (assoc-ref inputs "perl")))
(make-file-writable "magit-sequence.el") (make-file-writable "magit-sequence.el")
(emacs-substitute-variables "magit-sequence.el" (emacs-substitute-variables "magit-sequence.el"
("magit-perl-executable" (string-append perl "/bin/perl"))) ("magit-perl-executable" (string-append perl "/bin/perl"))))))
#t)))
(add-before 'check 'configure-git (add-before 'check 'configure-git
(lambda _ (lambda _
;; Otherwise some tests fail with error "unable to auto-detect ;; Otherwise some tests fail with error "unable to auto-detect
@ -717,12 +711,10 @@ (define-public emacs-magit
(chdir "..") (chdir "..")
(substitute* "t/magit-tests.el" (substitute* "t/magit-tests.el"
(("^\\(ert-deftest magit-toplevel:tramp.*" all) (("^\\(ert-deftest magit-toplevel:tramp.*" all)
(string-append all " (skip-unless nil)"))) (string-append all " (skip-unless nil)")))))
#t))
(add-before 'install 'enter-lisp-directory (add-before 'install 'enter-lisp-directory
(lambda _ (lambda _
(chdir "lisp") (chdir "lisp"))))))
#t)))))
(native-inputs (native-inputs
`(("texinfo" ,texinfo))) `(("texinfo" ,texinfo)))
(inputs (inputs
@ -741,7 +733,7 @@ (define-public emacs-magit
the tracked files, for example, and you can browse the history of past the tracked files, for example, and you can browse the history of past
changes. There is support for cherry picking, reverting, merging, changes. There is support for cherry picking, reverting, merging,
rebasing, and other common Git operations.") rebasing, and other common Git operations.")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public emacs-magit-svn (define-public emacs-magit-svn
(let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f")) (let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f"))