me
/
guix
Archived
1
0
Fork 0
Code

gnu: emacs-libgit: Improve package style. 

* gnu/packages/emacs-xyz.scm (emacs-libgit)[arguments]: Use G-expressions.
[native-inputs]: Re-order alphabetically.
master
Nicolas Goaziou 2023-01-29 21:47:21 +01:00
parent f0ff03069d
commit e70d8e3e1f
No known key found for this signature in database
GPG Key ID: DA00B4F048E92F2D
1 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1102,17 +1102,18 @@ on stdout instead of using a socket as the Emacsclient does.")
;; Use the cmake-build-system as it provides support for cross builds. ;; Use the cmake-build-system as it provides support for cross builds.
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-DUSE_SYSTEM_LIBGIT2=x") (list
#:configure-flags #~(list "-DUSE_SYSTEM_LIBGIT2=x")
;; Add the emacs-build-system byte compilation and install phases. ;; Add the emacs-build-system byte compilation and install phases.
#:imported-modules (,@%cmake-build-system-modules #:imported-modules `(,@%cmake-build-system-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:modules ((guix build cmake-build-system) #:modules '((guix build cmake-build-system)
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build emacs-utils) (guix build emacs-utils)
(guix build utils)) (guix build utils))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
(lambda _ (lambda _
;; Use Emacs 28 unibyte strings. ;; Use Emacs 28 unibyte strings.
@ -1121,12 +1122,11 @@ on stdout instead of using a socket as the Emacsclient does.")
(substitute* "src/egit-blob.c" (substitute* "src/egit-blob.c"
(("make_string") "make_unibyte_string")))) (("make_string") "make_unibyte_string"))))
(add-after 'unpack 'set-libgit--module-file (add-after 'unpack 'set-libgit--module-file
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out")))
(make-file-writable "libgit.el")
(emacs-substitute-variables "libgit.el" (emacs-substitute-variables "libgit.el"
("libgit--module-file" ("libgit--module-file"
(string-append (emacs:elpa-directory out) "/libegit2.so")))))) (string-append (emacs:elpa-directory #$output)
"/libegit2.so")))))
(add-after 'unpack 'skip-failing-tests (add-after 'unpack 'skip-failing-tests
;; XXX: Skip 2 failing tests (out of 29). ;; XXX: Skip 2 failing tests (out of 29).
(lambda _ (lambda _
@ -1157,14 +1157,13 @@ on stdout instead of using a socket as the Emacsclient does.")
(add-after 'emacs-build 'validate-compiled-autoloads (add-after 'emacs-build 'validate-compiled-autoloads
(assoc-ref emacs:%standard-phases 'validate-compiled-autoloads))))) (assoc-ref emacs:%standard-phases 'validate-compiled-autoloads)))))
(native-inputs (native-inputs
(list pkg-config emacs-no-x git-minimal)) (list emacs-no-x git-minimal pkg-config))
(inputs (inputs
(list libgit2)) (list libgit2))
(home-page "https://github.com/magit/libegit2") (home-page "https://github.com/magit/libegit2")
(synopsis "Emacs bindings for libgit2") (synopsis "Emacs bindings for libgit2")
(description "This is an experimental module written in C providing (description "This is an experimental module written in C providing
libgit2 bindings for Emacs, intended to boost the performance of Magit.") libgit2 bindings for Emacs, intended to boost the performance of Magit.")
;; The LICENSE file says GPL v2+, but libgit.el says GPL v3+.
(license license:gpl2+)))) (license license:gpl2+))))
(define-public emacs-magit (define-public emacs-magit