[nongnu] elpa/nix-mode 3cca5b6527 452/500: Merge pull request #133 from nagy/small-fixes

[ELPA Syncer]

branch: elpa/nix-mode
commit 3cca5b6527a69c4701394f424726282a1462ede3
Merge: 1fdf8e654a da7e638f2f
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #133 from nagy/small-fixes
    
    Small fixes
---
 README.md    |  4 ++--
 flake.nix    |  3 ++-
 nix-store.el |  2 +-
 nix.el       | 16 ++++++++--------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 99d2329558..7f3bd74a7a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Build 
Status](https://travis-ci.com/NixOS/nix-mode.svg?branch=master)](https://travis-ci.com/NixOS/nix-mode)
 
 An Emacs major mode for editing Nix expressions. There is also a
-manual available at nix-mode.org.
+manual available at [nix-mode.org](./nix-mode.org).
 
 ## Submodes
 
@@ -67,7 +67,7 @@ nix-repl.el has two purposes.
 
 First, it provides an interface for completion, used by nix-company.el.
 
-Second, it provides an interactive function to open an repl. You can
+Second, it provides an interactive function to open a repl. You can
 open this with:
 
 M-x nix-repl<RET>
diff --git a/flake.nix b/flake.nix
index cc5199796c..b09a2e1413 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,8 @@
           f
         ]);
       in stdenvNoCC.mkDerivation {
-        name = "nix-mode-1.4.5";
+        pname = "nix-mode";
+        version = "1.4.5";
         src = self;
         nativeBuildInputs = [ emacs texinfo git ];
         makeFlags = [ "PREFIX=$(out)" ];
diff --git a/nix-store.el b/nix-store.el
index e1cf96dfb5..b5bf922334 100644
--- a/nix-store.el
+++ b/nix-store.el
@@ -18,7 +18,7 @@
 PATH the path within /nix/store to realise"
   (make-process
    :buffer nil
-   :command (list nix-store-executable "-r" path)
+   :command (list nix-store-executable "--realise" path)
    :noquery t
    :name (format "*nix-store*<%s>" path)))
 
diff --git a/nix.el b/nix.el
index 48f802c005..29cfe66dd2 100644
--- a/nix.el
+++ b/nix.el
@@ -35,12 +35,12 @@
   :type 'string)
 
 (defcustom nix-instantiate-executable "nix-instantiate"
-  "Nix executable location."
+  "Nix-instantiate executable location."
   :group 'nix
   :type 'string)
 
 (defcustom nix-store-executable "nix-store"
-  "Nix executable location."
+  "Nix-store executable location."
   :group 'nix
   :type 'string)
 
@@ -52,12 +52,12 @@
 (defcustom nix-store-dir "/nix/store"
   "Nix store directory."
   :group 'nix
-  :type 'string)
+  :type 'directory)
 
 (defcustom nix-state-dir "/nix/var"
-  "Nix store directory."
+  "Nix state directory."
   :group 'nix
-  :type 'string)
+  :type 'directory)
 
 (defun nix-system ()
   "Get the current system tuple."
@@ -76,7 +76,7 @@
   "Show nix config."
   (nix--process-json "show-config" "--json"))
 
-(defvar nix-commands
+(defconst nix-commands
   '("add-to-store"
     "build"
     "cat-nar"
@@ -107,7 +107,7 @@
     "verify"
     "why-depends"))
 
-(defvar nix-toplevel-options
+(defconst nix-toplevel-options
   '("-v"
     "--verbose"
     "-h"
@@ -117,7 +117,7 @@
     "--option"
     "--version"))
 
-(defvar nix-config-options
+(defconst nix-config-options
   '("allowed-uris"
     "allow-import-from-derivation"
     "allow-new-priveleges"