aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-06-16 00:10:47 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-06-16 00:18:09 -0400
commitfb8542ed5c6b8d31bf09a8db0b9b14e8766c5dc5 (patch)
treec9ec0b726caf83915de36b442484eb3cd71e869a /gnu
parent4df47410cf84debed98c8d4934be6d7b614c9134 (diff)
downloadguix-fb8542ed5c6b8d31bf09a8db0b9b14e8766c5dc5.tar
guix-fb8542ed5c6b8d31bf09a8db0b9b14e8766c5dc5.tar.gz
gnu: emacs-yasnippet: Clean-up package definition.
An old snippet was causing the build to fail when using Emacs 27. * gnu/packages/emacs-xyz.scm (emacs-yasnippet)[source]: Use git-file-name, and remove obsolete snippet. [phases]{home}: New phase. This allows the rebindings test to pass. {make-tests-writable, delete-rebinding-test}: Remove phases. [description]: Re-indent.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/emacs-xyz.scm36
1 files changed, 7 insertions, 29 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e3c6c996cc..4d38c87570 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9507,48 +9507,26 @@ been adapted to work with mu4e.")
(uri (git-reference
(url "https://github.com/joaotavora/yasnippet.git")
(commit version)))
- (file-name (string-append name "-" version ".tar.gz"))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; YASnippet expects a "snippets" subdirectory in the same
- ;; directory as yasnippet.el, but we don't install it because it's
- ;; a git submodule pointing to an external repository. Adjust
- ;; `yas-snippet-dirs' to prevent warnings about a missing
- ;; directory.
- (substitute* "yasnippet.el"
- (("^ +'yas-installed-snippets-dir\\)\\)\n")
- "))\n"))
- #t))))
+ (base32 "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("emacs" "--batch"
"-l" "yasnippet-tests.el"
"-f" "ert-run-tests-batch-and-exit")
- ;; FIXME: one failing test.
#:phases
(modify-phases %standard-phases
- (add-before 'check 'make-tests-writable
- (lambda _
- (make-file-writable "yasnippet-tests.el")
- #t))
- (add-before 'check 'delete-rebinding-test
+ ;; Set HOME, otherwise test-rebindings fails.
+ (add-before 'check 'set-home
(lambda _
- (emacs-batch-edit-file "yasnippet-tests.el"
- `(progn (goto-char (point-min))
- (re-search-forward "ert-deftest test-rebindings")
- (beginning-of-line)
- (kill-sexp)
- (basic-save-buffer)))
+ (setenv "HOME" (getcwd))
#t)))))
(home-page "https://github.com/joaotavora/yasnippet")
(synopsis "Yet another snippet extension for Emacs")
- (description
- "YASnippet is a template system for Emacs. It allows you to type an
-abbreviation and automatically expand it into function templates.")
+ (description "YASnippet is a template system for Emacs. It allows you to
+type an abbreviation and automatically expand it into function templates.")
(license license:gpl3+)))
(define-public emacs-yasnippet-snippets