branch master updated: gnu: emacs-yasnippet-snippets: Resolve void function error.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2e9b7a2  gnu: emacs-yasnippet-snippets: Resolve void function error.
2e9b7a2 is described below

commit 2e9b7a207d4636dcaa31c81c5987893837219dbb
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Dec 3 13:26:52 2020 -0500

    gnu: emacs-yasnippet-snippets: Resolve void function error.
    
    Attempting to use the python-mode snippets shipped with this package would
    result in a '(void-function yasnippet-snippets--fixed-indent)' error being
    raised (failing the initialization of other packages such as Elpy).  The
    following change fixes this by not only installing the snippets but also the
    accompanying Elisp library that allows automatic discovery of the snippets.
    
    * gnu/packages/emacs-xyz.scm (emacs-yasnippet-snippets)[build-system]: 
Switch
    to emacs-build-system.
    [arguments]: Remove the #:module and #:builder arguments.  Add the #:include
    argument.
    [description]: Adjust to reflect that it is no longer necessary to manually
    add the snippets to the yas-snippet-dirs variable.
---
 gnu/packages/emacs-xyz.scm | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9bcd71b..5eb8f7c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10867,27 +10867,17 @@ type an abbreviation and automatically expand it into 
function templates.")
        (file-name (git-file-name name version))
        (sha256
         (base32 "18pcnjnqvcky6i49p38vy3ms5xiisn27vy47pc3vsgr3r2n87mqb"))))
-    (build-system trivial-build-system)
+    (build-system emacs-build-system)
     (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let* ((source (assoc-ref %build-inputs "source"))
-                (out (assoc-ref %outputs "out"))
-                (snippet-dir
-                 (string-append out "/share/emacs/yasnippet-snippets/")))
-           (with-directory-excursion source
-             (mkdir-p snippet-dir)
-             (copy-recursively "snippets" snippet-dir)))
-         #t)))
+     `(#:include (cons* "^snippets\\/" %default-include)))
+    (propagated-inputs
+     `(("emacs-s" ,emacs-s)             ;for snippets/rjsx-mode/.yas-setup.el
+       ("emacs-yasnippet" ,emacs-yasnippet)))
     (home-page "https://github.com/AndreaCrotti/yasnippet-snippets";)
     (synopsis "Collection of YASnippet snippets for many languages")
-    (description
-     "Provides Andrea Crotti's collection of YASnippet snippets.  After 
installation,
-the snippets will be in \"~/.guix-profile/share/emacs/yasnippet-snippets/\".
-To make YASnippet aware of these snippets, add the above directory to
-@code{yas-snippet-dirs}.")
+    (description "This package provides an extensive collection of YASnippet
+snippets.  When this package is installed, the extra snippets it provides are
+automatically made available to YASnippet.")
     (license license:gpl3+)))
 
 (define-public emacs-helm-c-yasnippet