branch: elpa/nix-mode
commit d0eb92e97a4ea4196355922902b8e93b8ac221b4
Author: Matthew Bauer <[email protected]>
Commit: Matthew Bauer <[email protected]>
Package linting
Some various cleanups from flycheck.
---
nix-instantiate.el | 14 +++++++++-----
nix-log.el | 4 +++-
nix-shell.el | 4 +++-
nix-store.el | 2 +-
nix.el | 3 ++-
5 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/nix-instantiate.el b/nix-instantiate.el
index 05607b4629..899ec9790b 100644
--- a/nix-instantiate.el
+++ b/nix-instantiate.el
@@ -23,17 +23,20 @@ DRV file to load from."
(setq result
(cdar (with-current-buffer stdout
(when (eq (buffer-size) 0)
- (error "nix show-derivation %s failed to produce any output"
+ (error "Nix’s show-derivation %s failed to produce any
output"
drv))
(goto-char (point-min))
(json-read))))
(kill-buffer stdout)
result))
-(defun nix-instantiate (nix-file &optional attribute)
+(defun nix-instantiate (nix-file &optional attribute parse)
"Run nix-instantiate on a Nix expression.
NIX-FILE the file to instantiate.
-ATTRIBUTE an attribute of the Nix file to use."
+ATTRIBUTE an attribute of the Nix file to use.
+PARSE whether to parse nix-instantiate output."
+ (interactive (list (read-file-name "Nix file: ") nil t))
+
(let ((stdout (generate-new-buffer "nix-instantiate"))
result)
(if attribute
@@ -46,8 +49,9 @@ ATTRIBUTE an attribute of the Nix file to use."
(error
"Error: nix-instantiate %s failed to produce any output"
nix-file))
- (setq result (nix-instantiate--parsed
- (substring (buffer-string) 0 (- (buffer-size) 1)))))
+ (setq result (substring (buffer-string) 0 (- (buffer-size) 1)))
+ (when parse
+ (setq result (nix-instantiate--parsed result))))
(kill-buffer stdout)
result))
diff --git a/nix-log.el b/nix-log.el
index 8a9b40b7e5..192ab3170e 100644
--- a/nix-log.el
+++ b/nix-log.el
@@ -15,7 +15,9 @@
(require 'nix-instantiate)
(defun nix-log (file attr)
- "Open the nix log."
+ "Open the nix log.
+FILE nix file to parse.
+ATTR attribute to load the log of."
(interactive (list (nix-read-file) nil))
(unless attr (setq attr (nix-read-attr file)))
diff --git a/nix-shell.el b/nix-shell.el
index 61420a0bad..e0307c02c3 100644
--- a/nix-shell.el
+++ b/nix-shell.el
@@ -106,6 +106,8 @@ ATTR from NIX-FILE to get Nix expressions from."
nix-shell-executable
file attr phase phase phase)))
+(declare-function flycheck-buffer "flycheck")
+
(defun nix-shell--callback (buffer drv)
"Run the nix-shell callback to setup the buffer.
The BUFFER to run in.
@@ -178,7 +180,7 @@ PKGS-FILE package set to pull from."
(insert (format "with import %s { };\n" pkgs-file))
(insert "runCommandCC \"shell\" {\n")
(insert " nativeBuildInputs = [\n")
- (mapcar (lambda (x) (insert (format " %s\n" x))) packages)
+ (mapc (lambda (x) (insert (format " %s\n" x))) packages)
(insert " ];\n")
(insert "} \"\"\n"))
nix-file))
diff --git a/nix-store.el b/nix-store.el
index c702f388d0..eeaecbb453 100644
--- a/nix-store.el
+++ b/nix-store.el
@@ -1,4 +1,4 @@
-;;; nix.el -- run nix commands in Emacs -*- lexical-binding: t -*-
+;;; nix-store.el -- run nix commands in Emacs -*- lexical-binding: t -*-
;; Author: Matthew Bauer <[email protected]>
;; Homepage: https://github.com/NixOS/nix-mode
diff --git a/nix.el b/nix.el
index e4961ba2db..3261e075b4 100644
--- a/nix.el
+++ b/nix.el
@@ -153,7 +153,8 @@
"trusted-users"))
(defun nix--pcomplete-flags (options)
- "Complete flags to the Nix command."
+ "Complete flags to the Nix command.
+OPTIONS a list of options to accept."
(while (pcomplete-match "^-" 0)
(pcomplete-here options)
(let ((last-arg (nth (1- pcomplete-index) pcomplete-args)))
