nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: emacs-magit: Update to 20190311. 

* gnu/packages/emacs-xyz.scm (emacs-magit): Update to 20190311.
master
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

142
gnu/packages/emacs-xyz.scm
View File

@ -252,89 +252,77 @@ on stdout instead of using a socket as the Emacsclient does.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-magit (define-public emacs-magit
(package ;; Version 2.90.1 has trouble loading the transient library,
(name "emacs-magit") ;; so we use a more recent commit that fixes it.
(version "2.90.1") (let ((commit "b4aec016b5577afa8d889f258b499814d1bb1d94"))
(source (origin (package
(method git-fetch) (name "emacs-magit")
(uri (git-reference (version (git-version "2.90.1" "1" commit))
(url "https://github.com/magit/magit") (source (origin
(commit (string-append "v" version)))) (method git-fetch)
(file-name (git-file-name name version)) (uri (git-reference
(sha256 (url "https://github.com/magit/magit")
(base32 (commit commit)))
"1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4")))) (file-name (git-file-name name version))
(build-system gnu-build-system) (sha256
(native-inputs `(("texinfo" ,texinfo) (base32
("emacs" ,emacs-minimal))) "0zl7v6z0y50pcgqsf2r8c1k3r5nwjad9ba7r6sgrnf4rc62br7jv"))))
(inputs (build-system gnu-build-system)
`(("git" ,git) (native-inputs `(("texinfo" ,texinfo)
("perl" ,perl))) ("emacs" ,emacs-minimal)))
(propagated-inputs (inputs
`(("dash" ,emacs-dash) `(("git" ,git)
("ghub" ,emacs-ghub) ("perl" ,perl)))
("graphql" ,emacs-graphql) (propagated-inputs
("treepy" ,emacs-treepy) `(("dash" ,emacs-dash)
("magit-popup" ,emacs-magit-popup) ("with-editor" ,emacs-with-editor)
("with-editor" ,emacs-with-editor))) ("transient" ,emacs-transient)))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%gnu-build-system-modules
(guix build emacs-utils)) (guix build emacs-utils))
#:test-target "test" #:test-target "test"
#:tests? #f ; tests are not included in the release #:tests? #f ; tests are not included in the release
#:make-flags #:make-flags
(list (string-append "PREFIX=" %output) (list (string-append "PREFIX=" %output)
;; Don't put .el files in a sub-directory. ;; Don't put .el files in a sub-directory.
(string-append "lispdir=" %output "/share/emacs/site-lisp") (string-append "lispdir=" %output "/share/emacs/site-lisp")
(string-append "DASH_DIR=" (string-append "DASH_DIR="
(assoc-ref %build-inputs "dash") (assoc-ref %build-inputs "dash")
"/share/emacs/site-lisp/guix.d/dash-" "/share/emacs/site-lisp/guix.d/dash-"
,(package-version emacs-dash)) ,(package-version emacs-dash))
(string-append "GHUB_DIR=" (string-append "WITH_EDITOR_DIR="
(assoc-ref %build-inputs "ghub") (assoc-ref %build-inputs "with-editor")
"/share/emacs/site-lisp/guix.d/ghub-" "/share/emacs/site-lisp/guix.d/with-editor-"
,(package-version emacs-ghub)) ,(package-version emacs-with-editor))
(string-append "GRAPHQL_DIR=" (string-append "TRANSIENT_DIR="
(assoc-ref %build-inputs "graphql") (assoc-ref %build-inputs "transient")
"/share/emacs/site-lisp/guix.d/graphql-" "/share/emacs/site-lisp/guix.d/transient-"
,(package-version emacs-graphql)) ,(package-version emacs-transient)))
(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)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before (add-before
'build 'patch-exec-paths 'build '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 "lisp/magit-sequence.el") (make-file-writable "lisp/magit-sequence.el")
(emacs-substitute-variables "lisp/magit-sequence.el" (emacs-substitute-variables "lisp/magit-sequence.el"
("magit-perl-executable" (string-append perl "/bin/perl"))) ("magit-perl-executable" (string-append perl "/bin/perl")))
#t)))))) #t))))))
(home-page "https://magit.vc/") (home-page "https://magit.vc/")
(synopsis "Emacs interface for the Git version control system") (synopsis "Emacs interface for the Git version control system")
(description (description
"With Magit, you can inspect and modify your Git repositories with Emacs. "With Magit, you can inspect and modify your Git repositories with Emacs.
You can review and commit the changes you have made to the tracked files, for You can review and commit the changes you have made to the tracked files, for
example, and you can browse the history of past changes. There is support for example, and you can browse the history of past changes. There is support for
cherry picking, reverting, merging, rebasing, and other common Git cherry picking, reverting, merging, rebasing, and other common Git
operations.") operations.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public magit (define-public magit
(deprecated-package "magit" emacs-magit)) (deprecated-package "magit" emacs-magit))