[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[Oleg Pykhalov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH] gnu: Add emacs-nixos-mode. --]
[-- Type: text/x-patch, Size: 1638 bytes --]

From 90ef6b8f1bf57820db95d7daf17f7e0fae303356 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sat, 12 Aug 2017 09:48:53 +0300
Subject: [PATCH] gnu: Add emacs-nixos-mode.

* gnu/packages/emacs.scm (emacs-nixos-mode): New variable.
---
 gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index bb5d2349f..adf1ef167 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -5331,3 +5331,29 @@ enables you to easily define search engines, bind them to keybindings, and
 query them from the comfort of your editor.")
     (home-page "https://github.com/hrs/engine-mode")
     (license license:gpl3+)))
+
+(define-public emacs-nixos-mode
+  (package
+    (name "emacs-nixos-mode")
+    (version "1.11.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/NixOS/nix/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "12110drl51r9bi45ql865jwvax1gladb5hfpwk0vi5bjybns6c9b"))))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-elisp
+           (lambda _
+             (chdir "misc/emacs"))))))
+    (synopsis "Emacs major mode for editing Nix expressions")
+    (description "@code{nixos-mode} provides an Emacs major mode for editing
+Nix expressions.")
+    (home-page "https://github.com/NixOS/nix")
+    (license license:gpl3+)))
-- 
2.14.1

[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[Arun Isaac]

Thanks for the patch!

Oleg Pykhalov writes:

> +(define-public emacs-nixos-mode
> +  (package
> +    (name "emacs-nixos-mode")
> +    (version "1.11.13")

misc/emacs/nix-mode.el says the version number is 1.0. This contradicts
the release version number 1.11.13. But, I guess we can go with the
release version number.

> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'chdir-elisp
> +           (lambda _
> +             (chdir "misc/emacs"))))))

It is kinda obvious, but do add a short comment explaining why we are
changing directory.

> +    (synopsis "Emacs major mode for editing Nix expressions")
> +    (description "@code{nixos-mode} provides an Emacs major mode for editing
> +Nix expressions.")

Could you add the following line to the description?

"It supports syntax highlighting, indenting and refilling of comments."

I have taken the above sentence from
https://github.com/NixOS/nix/blob/master/misc/emacs/README

> +    (license license:gpl3+)))

Nix is under the LGPL 2.1 license. So, nix-mode should also be under the
same license, right?

Could you send an updated patch? Thanks!

[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[ng0]

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

Arun Isaac transcribed 1.1K bytes:
> 
> Thanks for the patch!
> 
> Oleg Pykhalov writes:
> 
> > +(define-public emacs-nixos-mode
> > +  (package
> > +    (name "emacs-nixos-mode")
> > +    (version "1.11.13")
> 
> misc/emacs/nix-mode.el says the version number is 1.0. This contradicts
> the release version number 1.11.13. But, I guess we can go with the
> release version number.
> 
> > +    (arguments
> > +     `(#:phases
> > +       (modify-phases %standard-phases
> > +         (add-after 'unpack 'chdir-elisp
> > +           (lambda _
> > +             (chdir "misc/emacs"))))))
> 
> It is kinda obvious, but do add a short comment explaining why we are
> changing directory.
> 
> > +    (synopsis "Emacs major mode for editing Nix expressions")
> > +    (description "@code{nixos-mode} provides an Emacs major mode for editing
> > +Nix expressions.")
> 
> Could you add the following line to the description?
> 
> "It supports syntax highlighting, indenting and refilling of comments."
> 
> I have taken the above sentence from
> https://github.com/NixOS/nix/blob/master/misc/emacs/README
> 
> > +    (license license:gpl3+)))
> 
> Nix is under the LGPL 2.1 license. So, nix-mode should also be under the
> same license, right?
> 
> Could you send an updated patch? Thanks!

We have Nix in (gnu packages package-management).
Why do you fetch it again when we could just add
another output to the nix package?
-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org

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

[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[Oleg Pykhalov]

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

Hello Arun,

thank you for supporting this patch.

Arun Isaac <arunisaac@systemreboot.net> writes:

> Thanks for the patch!
>
> Oleg Pykhalov writes:

…

>> +    (arguments
>> +     `(#:phases
>> +       (modify-phases %standard-phases
>> +         (add-after 'unpack 'chdir-elisp
>> +           (lambda _
>> +             (chdir "misc/emacs"))))))
>
> It is kinda obvious, but do add a short comment explaining why we are
> changing directory.

DONE.

>> +    (synopsis "Emacs major mode for editing Nix expressions")
>> +    (description "@code{nixos-mode} provides an Emacs major mode for editing
>> +Nix expressions.")
>
> Could you add the following line to the description?
>
> "It supports syntax highlighting, indenting and refilling of comments."
>
> I have taken the above sentence from
> https://github.com/NixOS/nix/blob/master/misc/emacs/README

DONE.

>> +    (license license:gpl3+)))
>
> Nix is under the LGPL 2.1 license. So, nix-mode should also be under the
> same license, right?

DONE.

> Could you send an updated patch? Thanks!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] gnu: Add emacs-nixos-mode. --]
[-- Type: text/x-patch, Size: 1777 bytes --]

From 796f6a09c9464812f85c77641473ac9c85ac9654 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sat, 12 Aug 2017 09:48:53 +0300
Subject: [PATCH] gnu: Add emacs-nixos-mode.

* gnu/packages/emacs.scm (emacs-nixos-mode): New variable.
---
 gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index bb5d2349f..cdee59858 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -5331,3 +5331,31 @@ enables you to easily define search engines, bind them to keybindings, and
 query them from the comfort of your editor.")
     (home-page "https://github.com/hrs/engine-mode")
     (license license:gpl3+)))
+
+(define-public emacs-nixos-mode
+  (package
+    (name "emacs-nixos-mode")
+    (version "1.11.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/NixOS/nix/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "12110drl51r9bi45ql865jwvax1gladb5hfpwk0vi5bjybns6c9b"))))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-elisp
+           ;; Elisp directory is not in root of the source.
+           (lambda _
+             (chdir "misc/emacs"))))))
+    (synopsis "Emacs major mode for editing Nix expressions")
+    (description "@code{nixos-mode} provides an Emacs major mode for editing
+Nix expressions.  It supports syntax highlighting, indenting and refilling of
+comments.")
+    (home-page "https://github.com/NixOS/nix")
+    (license license:lgpl2.1+)))
-- 
2.14.1


[-- Attachment #3: Type: text/plain, Size: 26 bytes --]


-- 
Best regards,

Oleg.

[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[Oleg Pykhalov]

Hello ng0,

ng0 <ng0@infotropique.org> writes:

…

> We have Nix in (gnu packages package-management).
> Why do you fetch it again when we could just add
> another output to the nix package?

Didn't think about this.  It will not fetch again if sources are same, I
guess.  But it will be more proper way for sure.  The problem is that
I'm not very familiar with mixing build systems for now.  This bug
report probably needs to wait me or somebody else will do it.

-- 
Best regards,

Oleg.

[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[ng0]

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

Oleg Pykhalov transcribed 0.5K bytes:
> Hello ng0,
> 
> ng0 <ng0@infotropique.org> writes:
> 
> …
> 
> > We have Nix in (gnu packages package-management).
> > Why do you fetch it again when we could just add
> > another output to the nix package?
> 
> Didn't think about this.  It will not fetch again if sources are same, I
> guess.  But it will be more proper way for sure.  The problem is that
> I'm not very familiar with mixing build systems for now.  This bug
> report probably needs to wait me or somebody else will do it.
> 
> -- 
> Best regards,
> 
> Oleg.

Two other options:
 - Could you ask upstream to unbundle it?
 - Could we just get the file(s) needed as inputs on their own
   and use that?
-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org

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

[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[ng0]

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

Oleg Pykhalov transcribed 0.5K bytes:
> Hello ng0,
> 
> ng0 <ng0@infotropique.org> writes:
> 
> …
> 
> > We have Nix in (gnu packages package-management).
> > Why do you fetch it again when we could just add
> > another output to the nix package?
> 
> Didn't think about this.  It will not fetch again if sources are same, I
> guess.  But it will be more proper way for sure.  The problem is that
> I'm not very familiar with mixing build systems for now.  This bug
> report probably needs to wait me or somebody else will do it.
> 
> -- 
> Best regards,
> 
> Oleg.

Yet another option: inherit the package "nix" and adjust accordingly.
-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org

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

[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[Oleg Pykhalov]

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

ng0 <ng0@infotropique.org> writes:

…

>> > We have Nix in (gnu packages package-management).
>> > Why do you fetch it again when we could just add
>> > another output to the nix package?
>> 
>> Didn't think about this.  It will not fetch again if sources are same, I
>> guess.  But it will be more proper way for sure.  The problem is that
>> I'm not very familiar with mixing build systems for now.  This bug
>> report probably needs to wait me or somebody else will do it.

…

> Yet another option: inherit the package "nix" and adjust accordingly.

I think this is the best option.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] gnu: Add emacs-nix-mode. --]
[-- Type: text/x-patch, Size: 1320 bytes --]

From b69c7020ba88f541666eda41753540e571666607 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sat, 12 Aug 2017 09:48:53 +0300
Subject: [PATCH] gnu: Add emacs-nix-mode.

* gnu/packages/emacs.scm (emacs-nix-mode): New variable.
---
 gnu/packages/emacs.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index bb5d2349f..e728419a2 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -5226,6 +5226,24 @@ multiplexer.")
 editing RPM spec files.")
     (license license:gpl2+)))
 
+(define-public emacs-nix-mode
+  (package
+    (inherit nix)
+    (name "emacs-nix-mode")
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-elisp
+           ;; Elisp directory is not in root of the source.
+           (lambda _
+             (chdir "misc/emacs"))))))
+    (synopsis "Emacs major mode for editing Nix expressions")
+    (description "@code{nixos-mode} provides an Emacs major mode for editing
+Nix expressions.  It supports syntax highlighting, indenting and refilling of
+comments.")
+    (license license:lgpl2.1+)))
+
 (define-public emacs-git-messenger
   (package
     (name "emacs-git-messenger")
-- 
2.14.1


[-- Attachment #3: Type: text/plain, Size: 26 bytes --]


-- 
Best regards,

Oleg.

[bug#28060] [PATCH] gnu: Add emacs-nixos-mode.

[Oleg Pykhalov]

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

Oleg Pykhalov <go.wigust@gmail.com> writes:

> ng0 <ng0@infotropique.org> writes:
>
> …
>
>>> > We have Nix in (gnu packages package-management).
>>> > Why do you fetch it again when we could just add
>>> > another output to the nix package?
>>> 
>>> Didn't think about this.  It will not fetch again if sources are same, I
>>> guess.  But it will be more proper way for sure.  The problem is that
>>> I'm not very familiar with mixing build systems for now.  This bug
>>> report probably needs to wait me or somebody else will do it.
>
> …
>
>> Yet another option: inherit the package "nix" and adjust accordingly.
>
> I think this is the best option.

Don't need the license field.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] gnu: Add emacs-nix-mode. --]
[-- Type: text/x-patch, Size: 1287 bytes --]

From 0ab1fceaf6eead2c72b4764ce91ecfe005097de4 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sat, 12 Aug 2017 09:48:53 +0300
Subject: [PATCH] gnu: Add emacs-nix-mode.

* gnu/packages/emacs.scm (emacs-nix-mode): New variable.
---
 gnu/packages/emacs.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index bb5d2349f..5a69990c6 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -5226,6 +5226,23 @@ multiplexer.")
 editing RPM spec files.")
     (license license:gpl2+)))
 
+(define-public emacs-nix-mode
+  (package
+    (inherit nix)
+    (name "emacs-nix-mode")
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-elisp
+           ;; Elisp directory is not in root of the source.
+           (lambda _
+             (chdir "misc/emacs"))))))
+    (synopsis "Emacs major mode for editing Nix expressions")
+    (description "@code{nixos-mode} provides an Emacs major mode for editing
+Nix expressions.  It supports syntax highlighting, indenting and refilling of
+comments.")))
+
 (define-public emacs-git-messenger
   (package
     (name "emacs-git-messenger")
-- 
2.14.1


[-- Attachment #3: Type: text/plain, Size: 26 bytes --]


-- 
Best regards,

Oleg.

bug#28060: [PATCH] gnu: Add emacs-nixos-mode.

[Arun Isaac]

>>> Yet another option: inherit the package "nix" and adjust accordingly.

Good idea!

Pushed, thanks!