* [bug#32015] [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.
@ 2018-06-30 3:05 Oleg Pykhalov
2018-07-01 10:20 ` 宋文武
0 siblings, 1 reply; 3+ messages in thread
From: Oleg Pykhalov @ 2018-06-30 3:05 UTC (permalink / raw)
To: 32015
'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@gnu.org>
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
-;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Julien Lepiller <julien@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#32015] [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.
2018-06-30 3:05 [bug#32015] [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix' Oleg Pykhalov
@ 2018-07-01 10:20 ` 宋文武
2018-07-01 16:38 ` bug#32015: " Oleg Pykhalov
0 siblings, 1 reply; 3+ messages in thread
From: 宋文武 @ 2018-07-01 10:20 UTC (permalink / raw)
To: Oleg Pykhalov; +Cc: 32015
Oleg Pykhalov <go.wigust@gmail.com> writes:
> 'nix' version 2 doesn't provide Emacs libraries.
>
Applied, thank you!
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#32015: [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix'.
2018-07-01 10:20 ` 宋文武
@ 2018-07-01 16:38 ` Oleg Pykhalov
0 siblings, 0 replies; 3+ messages in thread
From: Oleg Pykhalov @ 2018-07-01 16:38 UTC (permalink / raw)
To: 宋文武; +Cc: 32015, 32015-done
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
Hello,
iyzsong@member.fsf.org (宋文武) writes:
> Oleg Pykhalov <go.wigust@gmail.com> writes:
>
>> 'nix' version 2 doesn't provide Emacs libraries.
>>
>
> Applied, thank you!
Thank you for review.
Oleg.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-02 1:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-30 3:05 [bug#32015] [PATCH] gnu: emacs-nix-mode: Do not inherit 'nix' Oleg Pykhalov
2018-07-01 10:20 ` 宋文武
2018-07-01 16:38 ` bug#32015: " Oleg Pykhalov
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.