[bug#36528] [PATCH 1/2] gnu: emacs-polymode: Update to 0.2.

[bug#36528] [PATCH 1/2] gnu: emacs-polymode: Update to 0.2.

[LaFreniere, Joseph]

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


--
Joseph LaFreniere

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-polymode-Update-to-0.2.patch --]
[-- Type: text/x-patch, Size: 2894 bytes --]

From 26ff7839d21547afb731a8d6f7ebb68413f4a58e Mon Sep 17 00:00:00 2001
From: Joseph LaFreniere <joseph@lafreniere.xyz>
Date: Fri, 5 Jul 2019 19:39:05 -0500
Subject: [PATCH 1/2] gnu: emacs-polymode: Update to 0.2.

* gnu/packages/emacs-xyz.scm (emacs-polymode): Update to 0.2.
[source]: Change URL of Git repository to Polymode GitHub project.
[homepage]: Change URL to polymode GitHub project.
[description]: Realign text.
---
 gnu/packages/emacs-xyz.scm | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b6051c0ac1..b872c36b4b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9168,33 +9168,25 @@ contexts.
 (define-public emacs-polymode
   (package
     (name "emacs-polymode")
-    (version "0.1.5")
+    (version "0.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/vspinu/polymode.git")
+                    (url "https://github.com/polymode/polymode.git")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0wwphs54jx48a3ca6x1qaz56j3j9bg4mv8g2akkffrzbdcb8sbc7"))))
+                "04v0gnzfsjb50bgly6kvpryx8cyzwjaq2llw4qv9ijw1l6ixmq3b"))))
     (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,
-object oriented and highly extensible.  Creating a new polymode typically
-takes only a few lines of code.  Polymode also provides extensible facilities
-for external literate programming tools for exporting, weaving and tangling.")
+    (description
+     "Polymode is an Emacs package that offers generic support for multiple
+major modes inside a single Emacs buffer.  It is lightweight, object oriented
+and highly extensible.  Creating a new polymode typically 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
-- 
2.22.0

[bug#36528] [PATCH 2/2] gnu: Add emacs-polymode-org.

[LaFreniere, Joseph]

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


--
Joseph LaFreniere

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-emacs-polymode-org.patch --]
[-- Type: text/x-patch, Size: 1820 bytes --]

From e18a93f3cdb6c1e317600f582f71733066436c6c Mon Sep 17 00:00:00 2001
From: Joseph LaFreniere <joseph@lafreniere.xyz>
Date: Thu, 4 Jul 2019 23:11:46 -0500
Subject: [PATCH 2/2] gnu: Add emacs-polymode-org.

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

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b872c36b4b..583bc5a315 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9218,6 +9218,33 @@ literate programming tools for exporting, weaving and tangling.")
        "Edit YAML files for Ansible containing embedded Jinja2 templating.")
       (license license:gpl3+))))
 
+(define-public emacs-polymode-org
+  (package
+    (name "emacs-polymode-org")
+    (version "0.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/polymode/poly-org.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-polymode" ,emacs-polymode)))
+    (properties '((upstream-name . "poly-org")))
+    (home-page "https://github.com/polymode/poly-org")
+    (synopsis "Polymode definitions for Org mode buffers")
+    (description
+     "Provides definitions for @code{emacs-polymode} to support
+@code{emacs-org} buffers.  Edit source blocks in an Org mode buffer using the
+native modes of the blocks' languages while remaining inside the primary Org
+buffer.")
+    (license license:gpl3+)))
+
 (define-public eless
   (package
     (name "eless")
-- 
2.22.0

bug#36528: [PATCH 1/2] gnu: emacs-polymode: Update to 0.2.

[Ludovic Courtès]

"LaFreniere, Joseph" <joseph@lafreniere.xyz> skribis:

>>From 26ff7839d21547afb731a8d6f7ebb68413f4a58e Mon Sep 17 00:00:00 2001
> From: Joseph LaFreniere <joseph@lafreniere.xyz>
> Date: Fri, 5 Jul 2019 19:39:05 -0500
> Subject: [PATCH 1/2] gnu: emacs-polymode: Update to 0.2.
>
> * gnu/packages/emacs-xyz.scm (emacs-polymode): Update to 0.2.
> [source]: Change URL of Git repository to Polymode GitHub project.
> [homepage]: Change URL to polymode GitHub project.
> [description]: Realign text.

Applied, thanks!

Ludo'.

[bug#36528] [PATCH 2/2] gnu: Add emacs-polymode-org.

[Ludovic Courtès]

"LaFreniere, Joseph" <joseph@lafreniere.xyz> skribis:

>>From e18a93f3cdb6c1e317600f582f71733066436c6c Mon Sep 17 00:00:00 2001
> From: Joseph LaFreniere <joseph@lafreniere.xyz>
> Date: Thu, 4 Jul 2019 23:11:46 -0500
> Subject: [PATCH 2/2] gnu: Add emacs-polymode-org.
>
> * gnu/packages/emacs-xyz.scm (emacs-polymode-org): New variable.

Applied, thanks!