GNU bug report logs - #32015
[PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32015 in the body.
You can then email your comments to 32015 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.
Date: Sat, 30 Jun 2018 06:05:56 +0300

'nix' version 2 doesn't provide Emacs libraries.

* gnu/packages/package-management.scm (emacs-nix-mode): Do not inherit 'nix'.
---
 gnu/packages/package-management.scm | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 6a55f62ee..1c31230e5 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis <at> gmail.com>
-;;; Copyright © 2017 Oleg Pykhalov <go.wigust <at> gmail.com>
+;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust <at> gmail.com>
 ;;; Copyright © 2017 Roel Janssen <roel <at> gnu.org>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018 Julien Lepiller <julien <at> lepiller.eu>
@@ -41,6 +41,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages emacs)
   #:use-module (gnu packages file)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
@@ -433,20 +434,27 @@ sub-directory.")
 
 (define-public emacs-nix-mode
   (package
-    (inherit nix)
     (name "emacs-nix-mode")
+    (version "1.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/NixOS/nix-mode/archive/v"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "06aqz0czznsj8835jqnk794sy2p6pa8kxfqwh0nl5d5vxivria6z"))))
     (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"))))))
+    (inputs
+     `(("emacs-company" ,emacs-company)
+       ("emacs-mmm-mode" ,emacs-mmm-mode)))
+    (home-page "https://github.com/NixOS/nix-mode")
     (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.")))
+comments.")
+    (license license:lgpl2.1+)))
 
 (define-public stow
   (package
-- 
2.18.0

Message #8 received at 32015 <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> member.fsf.org (宋文武)
To: Oleg Pykhalov <go.wigust <at> gmail.com>
Cc: 32015 <at> debbugs.gnu.org
Subject: Re: [bug#32015] [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.
Date: Sun, 01 Jul 2018 18:20:45 +0800

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

> 'nix' version 2 doesn't provide Emacs libraries.
>

Applied, thank you!

Message #11 received at 32015 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: iyzsong <at> member.fsf.org (宋文武)
Cc: 32015-done <at> debbugs.gnu.org, 32015 <at> debbugs.gnu.org
Subject: Re: [bug#32015] [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.
Date: Sun, 01 Jul 2018 19:38:36 +0300

[Message part 1 (text/plain, inline)]

Hello,

iyzsong <at> member.fsf.org (宋文武) writes:

> Oleg Pykhalov <go.wigust <at> gmail.com> writes:
>
>> 'nix' version 2 doesn't provide Emacs libraries.
>>
>
> Applied, thank you!

Thank you for review.

Oleg.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.