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

gnu: emacs-magit: Update to 20190311.

Browse source 
* gnu/packages/emacs-xyz.scm (emacs-magit): Update to 20190311.
This commit is contained in:
Pierre Neidhardt 2019-03-15 16:51:42 +01:00
parent a6e4af53f9
commit 3a7ca60adc
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
1 changed files with 65 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -252,18 +252,21 @@ (define-public emacs-with-editor
(license license:gpl3+)))
(define-public emacs-magit
;; Version 2.90.1 has trouble loading the transient library,
;; so we use a more recent commit that fixes it.
(let ((commit "b4aec016b5577afa8d889f258b499814d1bb1d94"))
(package
(name "emacs-magit")
(version "2.90.1")
(version (git-version "2.90.1" "1" 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
"1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4"))))
"0zl7v6z0y50pcgqsf2r8c1k3r5nwjad9ba7r6sgrnf4rc62br7jv"))))
(build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal)))
@ -272,11 +275,8 @@ (define-public emacs-magit
("perl" ,perl)))
(propagated-inputs
`(("dash" ,emacs-dash)
("ghub" ,emacs-ghub)
("graphql" ,emacs-graphql)
("treepy" ,emacs-treepy)
("magit-popup" ,emacs-magit-popup)
("with-editor" ,emacs-with-editor)))
("with-editor" ,emacs-with-editor)
("transient" ,emacs-transient)))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
@ -294,26 +294,14 @@ (define-public emacs-magit
(assoc-ref %build-inputs "dash")
"/share/emacs/site-lisp/guix.d/dash-"
,(package-version emacs-dash))
(string-append "GHUB_DIR="
(assoc-ref %build-inputs "ghub")
"/share/emacs/site-lisp/guix.d/ghub-"
,(package-version emacs-ghub))
(string-append "GRAPHQL_DIR="
(assoc-ref %build-inputs "graphql")
"/share/emacs/site-lisp/guix.d/graphql-"
,(package-version emacs-graphql))
(string-append "TREEPY_DIR="
(assoc-ref %build-inputs "treepy")
"/share/emacs/site-lisp/guix.d/treepy-"
,(package-version emacs-treepy))
(string-append "MAGIT_POPUP_DIR="
(assoc-ref %build-inputs "magit-popup")
"/share/emacs/site-lisp/guix.d/magit-popup-"
,(package-version emacs-magit-popup))
(string-append "WITH_EDITOR_DIR="
(assoc-ref %build-inputs "with-editor")
"/share/emacs/site-lisp/guix.d/with-editor-"
,(package-version emacs-with-editor)))
,(package-version emacs-with-editor))
(string-append "TRANSIENT_DIR="
(assoc-ref %build-inputs "transient")
"/share/emacs/site-lisp/guix.d/transient-"
,(package-version emacs-transient)))
#:phases
(modify-phases %standard-phases
@ -334,7 +322,7 @@ (define-public emacs-magit
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 magit
(deprecated-package "magit" emacs-magit))