[bug#33511] [PATCH 0/3] gnu: Add emacs-polymode-ansible.

[bug#33511] [PATCH 0/3] gnu: Add emacs-polymode-ansible.

[Oleg Pykhalov]

This patch series updates emacs-polymode to upstream 0.1.5 release and adds
emacs-polymode-ansible to support Jinja2 syntax in Ansible playbooks.

Oleg Pykhalov (3):
  gnu: emacs-polymode: Update to 0.1.5-1.06c4329.
  gnu: Add emacs-ansible-doc.
  gnu: Add emacs-polymode-ansible.

 gnu/packages/admin.scm | 29 ++++++++++++++++++++++++
 gnu/packages/emacs.scm | 51 +++++++++++++++++++++++++++++-------------
 2 files changed, 64 insertions(+), 16 deletions(-)

-- 
2.19.1

[bug#33511] [PATCH 1/3] gnu: emacs-polymode: Update to 0.1.5-1.06c4329.

[Oleg Pykhalov]

* gnu/packages/emacs.scm (emacs-polymode): Update to 0.1.5-1.06c4329.
---
 gnu/packages/emacs.scm | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 911290254..c18225792 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -7914,32 +7914,21 @@ contexts.
     (license license:gpl3+)))
 
 (define-public emacs-polymode
-  ;; There hasn't been a proper release.
-  (let ((commit "0340f5e7e55235832e59673f027cc79a23cbdcd6")
-        (revision "1"))
+  (let ((commit "06c4329fdf765b4f9072e20906c8737a19e6646b"))
     (package
       (name "emacs-polymode")
-      (version (string-append "1.0-" revision "." (string-take commit 7)))
+      (version (git-version "0.1.5" "1" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
                       (url "https://github.com/vspinu/polymode.git")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "057cybkq3cy07n5s332k071sjiky3mziy003lza4rh75mgqkwhmh"))))
+                  "0wwphs54jx48a3ca6x1qaz56j3j9bg4mv8g2akkffrzbdcb8sbc7"))))
       (build-system emacs-build-system)
-      (arguments
-       `(#:include (cons* "^modes/.*\\.el$" %default-include)
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'set-emacs-load-path 'add-modes-subdir-to-load-path
-             (lambda _
-               (setenv "EMACSLOADPATH"
-                       (string-append (getenv "EMACSLOADPATH")
-                                      ":" (getcwd) "/modes" ":")))))))
-      (home-page "https://github.com/vspinu/polymode")
+      (home-page "https://github.com/polymode/polymode")
       (synopsis "Framework for multiple Emacs modes based on indirect buffers")
       (description "Polymode is an Emacs package that offers generic support
 for multiple major modes inside a single Emacs buffer.  It is lightweight,
-- 
2.19.1

[bug#33511] [PATCH 2/3] gnu: Add emacs-ansible-doc.

[Oleg Pykhalov]

* gnu/packages/admin.scm (emacs-ansible-doc): New variable.
---
 gnu/packages/admin.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 28961ecf8..c725fb9a2 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -45,6 +45,7 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system emacs)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
@@ -1622,6 +1623,34 @@ ad hoc task execution, and multinode orchestration---including trivializing
 things like zero-downtime rolling updates with load balancers.")
     (license license:gpl3+)))
 
+(define-public emacs-ansible-doc
+  (let ((commit "86083a7bb2ed0468ca64e52076b06441a2f8e9e0"))
+    (package
+      (name "emacs-ansible-doc")
+      (version (git-version "0.4" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/lunaryorn/ansible-doc.el")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0lap404ch74w99n3xip176jr42b38xhyzkfnkyqg0g3wk2cd3aq8"))))
+      (build-system emacs-build-system)
+      ;; Unmaintained by upstream.
+      (home-page "https://github.com/lunaryorn/ansible-doc.el")
+      (synopsis "Ansible documentation for Emacs")
+      (description
+       "This package provides an Ansible documentation for GNU Emacs.
+
+@code{ansible-doc} allows you to view the documentation of an Ansible
+module and @code{ansible-doc-mode} minor mode adds documentation
+lookup to YAML Mode.  You could enable the mode with @code{(add-hook
+'yaml-mode-hook #'ansible-doc-mode)}.")
+      (license license:gpl3+))))
+
 (define-public cpulimit
   (package
     (name "cpulimit")
-- 
2.19.1

[bug#33511] [PATCH 3/3] gnu: Add emacs-polymode-ansible.

[Oleg Pykhalov]

* gnu/packages/emacs.scm (emacs-polymode-ansible): New variable.
---
 gnu/packages/emacs.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c18225792..52fa90dab 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -71,6 +71,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages cmake)
@@ -7937,6 +7938,35 @@ takes only a few lines of code.  Polymode also provides extensible facilities
 for external literate programming tools for exporting, weaving and tangling.")
       (license license:gpl3+))))
 
+(define-public emacs-polymode-ansible
+  (let ((commit "b26094d029e25dc797b94254f797e7807a57e4c8"))
+    (package
+      (name "emacs-polymode-ansible")
+      ;; No upstream version release yet.
+      (version (git-version "0.1" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/mavit/poly-ansible")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "055shddqibib3hx2ykwdz910nrqws40cd407mq946l2bf6v87gj6"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-ansible-doc" ,emacs-ansible-doc)
+         ("emacs-jinja2-mode" ,emacs-jinja2-mode)
+         ("emacs-polymode" ,emacs-polymode)
+         ("emacs-yaml-mode" ,emacs-yaml-mode)))
+      (properties '((upstream-name . "poly-ansible")))
+      (home-page "https://gitlab.com/mavit/poly-ansible/")
+      (synopsis "Polymode for Ansible - Jinja2 in YAML")
+      (description
+       "Edit YAML files for Ansible containing embedded Jinja2 templating.")
+      (license license:gpl3+))))
+
 (define-public eless
   (package
     (name "eless")
-- 
2.19.1

bug#33511: [PATCH 3/3] gnu: Add emacs-polymode-ansible.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 106 bytes --]

Pushed to master as 2b6164f033d3cf3f584d89ac0eb3d681f1c1fcf9 and
bc3ece7d3d839270572149efbb8b67123f0830e8

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]