[bug#28381] [PATCH] gnu: emacs-skewer-mode: Install html and js files.

[bug#28381] [PATCH] gnu: emacs-skewer-mode: Install html and js files.

[Oleg Pykhalov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH] gnu: emacs-skewer-mode: Install html and js files. --]
[-- Type: text/x-patch, Size: 1564 bytes --]

From 1cc40f4a0088cbed1ae9f6ca0efdf89a52bf01a5 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Thu, 7 Sep 2017 15:03:31 +0300
Subject: [PATCH] gnu: emacs-skewer-mode: Install html and js files.

* gnu/packages/emacs.scm (emacs-skewer-mode): Install html and js files.
---
 gnu/packages/emacs.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 9c0f9bc89..a7ec0b146 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1967,6 +1967,21 @@ serve files and directory listings.")
     (propagated-inputs
      `(("emacs-simple-httpd" ,emacs-simple-httpd)
        ("emacs-js2-mode" ,emacs-js2-mode)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-html-js
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((skewer-mode (string-append (assoc-ref outputs "out")
+                                               "/share/emacs/site-lisp/guix.d"
+                                               "/skewer-mode-"
+                                               ,version)))
+               (for-each (lambda (file)
+                           (install-file file skewer-mode))
+                         '("example.html"
+                           "skewer-everything.user.js"
+                           "skewer.js")))
+             #t)))))
     (home-page "https://github.com/skeeto/skewer-mode")
     (synopsis "Live web development in Emacs")
     (description
-- 
2.14.1

[bug#28381] [PATCH] gnu: emacs-skewer-mode: Install html and js files.

[Alex Kost]

Oleg Pykhalov (2017-09-07 15:06 +0300) wrote:

>>From 1cc40f4a0088cbed1ae9f6ca0efdf89a52bf01a5 Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Thu, 7 Sep 2017 15:03:31 +0300
> Subject: [PATCH] gnu: emacs-skewer-mode: Install html and js files.
>
> * gnu/packages/emacs.scm (emacs-skewer-mode): Install html and js files.
> ---
>  gnu/packages/emacs.scm | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 9c0f9bc89..a7ec0b146 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -1967,6 +1967,21 @@ serve files and directory listings.")
>      (propagated-inputs
>       `(("emacs-simple-httpd" ,emacs-simple-httpd)
>         ("emacs-js2-mode" ,emacs-js2-mode)))
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'install 'install-html-js
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let ((skewer-mode (string-append (assoc-ref outputs "out")
> +                                               "/share/emacs/site-lisp/guix.d"
> +                                               "/skewer-mode-"
> +                                               ,version)))
> +               (for-each (lambda (file)
> +                           (install-file file skewer-mode))
> +                         '("example.html"
> +                           "skewer-everything.user.js"
> +                           "skewer.js")))
> +             #t)))))

I think it would be easier to use '#:include' instead of this phase,
like this:

    (arguments '(#:include '("\\.el$" "\\.js$" "\\.html$")))

What do you think?  If it is OK for you, could you please send an
updated patch?

-- 
Alex

[bug#28381] [PATCH] gnu: emacs-skewer-mode: Install html and js files.

[Oleg Pykhalov]

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

Hello Alex,

Alex Kost <alezost@gmail.com> writes:

> Oleg Pykhalov (2017-09-07 15:06 +0300) wrote:
>
>>>>From 1cc40f4a0088cbed1ae9f6ca0efdf89a52bf01a5 Mon Sep 17 00:00:00 2001
>> From: Oleg Pykhalov <go.wigust@gmail.com>
>> Date: Thu, 7 Sep 2017 15:03:31 +0300
>> Subject: [PATCH] gnu: emacs-skewer-mode: Install html and js files.
>>
>> * gnu/packages/emacs.scm (emacs-skewer-mode): Install html and js files.
>> ---
>>  gnu/packages/emacs.scm | 15 +++++++++++++++
>>  1 file changed, 15 insertions(+)
>>
>> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
>> index 9c0f9bc89..a7ec0b146 100644
>> --- a/gnu/packages/emacs.scm
>> +++ b/gnu/packages/emacs.scm
>> @@ -1967,6 +1967,21 @@ serve files and directory listings.")
>>      (propagated-inputs
>>       `(("emacs-simple-httpd" ,emacs-simple-httpd)
>>         ("emacs-js2-mode" ,emacs-js2-mode)))
>> +    (arguments
>> +     `(#:phases
>> +       (modify-phases %standard-phases
>> +         (add-after 'install 'install-html-js
>> +           (lambda* (#:key outputs #:allow-other-keys)
>> +             (let ((skewer-mode (string-append (assoc-ref outputs "out")
>> +                                               "/share/emacs/site-lisp/guix.d"
>> +                                               "/skewer-mode-"
>> +                                               ,version)))
>> +               (for-each (lambda (file)
>> +                           (install-file file skewer-mode))
>> +                         '("example.html"
>> +                           "skewer-everything.user.js"
>> +                           "skewer.js")))
>> +             #t)))))
>
> I think it would be easier to use '#:include' instead of this phase,
> like this:
>
>     (arguments '(#:include '("\\.el$" "\\.js$" "\\.html$")))
>
> What do you think?  If it is OK for you, could you please send an
> updated patch?

Sure, it's better.  Thanks for great suggestion.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-skewer-mode-Include-html-and-js-files.patch --]
[-- Type: text/x-patch, Size: 907 bytes --]

From 595a0e662d9e18f366870497555dee77ea22dae2 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sun, 17 Sep 2017 12:08:11 +0300
Subject: [PATCH] gnu: emacs-skewer-mode: Include html and js files.

* gnu/packages/emacs.scm (emacs-skewer-mode): Include html and js files.
---
 gnu/packages/emacs.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 2b82ced4e..5839f0faf 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1979,6 +1979,9 @@ serve files and directory listings.")
     (propagated-inputs
      `(("emacs-simple-httpd" ,emacs-simple-httpd)
        ("emacs-js2-mode" ,emacs-js2-mode)))
+    (arguments
+     '(#:include
+       '("\\.el$" "\\.js$" "\\.html$")))
     (home-page "https://github.com/skeeto/skewer-mode")
     (synopsis "Live web development in Emacs")
     (description
-- 
2.14.1

bug#28381: [PATCH] gnu: emacs-skewer-mode: Install html and js files.

[Alex Kost]

Oleg Pykhalov (2017-09-17 12:15 +0300) wrote:

> Hello Alex,
>
> Alex Kost <alezost@gmail.com> writes:
[...]
>> I think it would be easier to use '#:include' instead of this phase,
>> like this:
>>
>>     (arguments '(#:include '("\\.el$" "\\.js$" "\\.html$")))
>>
>> What do you think?  If it is OK for you, could you please send an
>> updated patch?
>
> Sure, it's better.  Thanks for great suggestion.
>
>>From 595a0e662d9e18f366870497555dee77ea22dae2 Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Sun, 17 Sep 2017 12:08:11 +0300
> Subject: [PATCH] gnu: emacs-skewer-mode: Include html and js files.

Great, thank you!  Applied:

http://git.savannah.gnu.org/cgit/guix.git/commit/?id=46f5ae0b35c14cd733fd34e46c675e33c6c15682

-- 
Alex