Merge pull request #183 from nagy/compiler-warnings

Fix some compiler warnings

Author: matthewbauer

.github/workflows/test.yml

@@ -18,6 +18,6 @@ jobs:
       with:
         nix_path: nixpkgs=channel:${{ matrix.nixpkgs_channel }}
     #- run: nix build
-    - run: nix-build -E '(import ./.).defaultPackage.${builtins.currentSystem}'
+    - run: nix-build -E '(import ./.).packages.${builtins.currentSystem}'
     #- run: nix flake check
     - run: nix-build -E '(import ./.).checks.${builtins.currentSystem}'

Makefile

@@ -1,11 +1,13 @@
 .PHONY: test clean install run
 
-ELS  =  nix.el nix-company.el nix-drv-mode.el nix-format.el \
+ELS  =  nix.el nix-company.el nix-drv-mode.el nix-flake.el nix-format.el \
 	nix-instantiate.el nix-mode.el nix-mode-mmm.el \
 	nix-prettify-mode.el nix-repl.el nix-search.el nix-shebang.el \
 	nix-shell.el nix-store.el
 ELCS = $(ELS:.el=.elc)
 
+DOCS = nix-mode.pdf nix-mode.html nix-mode.info
+
 TESTS = tests/nix-mode-tests.el tests/nix-font-lock-tests.el
 
 DESTDIR =

flake.lock

@@ -8,16 +8,15 @@
     forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
   in {
     packages = forAllSystems (system: with (import nixpkgs { inherit system; }); {
-      nix-mode = let
+      default = let
         emacs = emacsWithPackages (epkgs: with epkgs; [
-          org-plus-contrib
+          org-contrib
           company
           mmm-mode
-          f
           magit-section
           transient
         ]);
-      in stdenvNoCC.mkDerivation {
+      in stdenv.mkDerivation {
         pname = "nix-mode";
         version = "1.5.0";
         src = self;
@@ -31,12 +30,10 @@
       };
     });
 
-    defaultPackage = forAllSystems (system: self.packages.${system}.nix-mode);
-
     # checks are run in ‘make check’ right now we should probably move
     # these to its own derivation
     checks = forAllSystems (system: {
-      inherit (self.packages.${system}) nix-mode;
+      inherit (self.packages.${system}) default;
     });
   };
 }

flake.nix

@@ -27,7 +27,7 @@ ATTR the attribute to find in nix expressions."
     (call-process nix-executable nil (list stdout nil) nil
 		  "edit" "-f" file attr)
     (with-current-buffer stdout
-      (when (eq (buffer-size) 0)
+      (when (zerop (buffer-size))
 	(error
 	 "Error: nix edit failed to produce any output"))
       (setq result (substring (buffer-string) 0 (- (buffer-size) 1))))

nix-edit.el

@@ -13,14 +13,13 @@
   :group 'nix
   :type 'string)
 
-(if (fboundp 'replace-buffer-contents)
-    (defun nix--replace-buffer-contents (src dst)
-      (with-current-buffer dst (replace-buffer-contents src)))
-  (defun nix--replace-buffer-contents (src dst)
-    (if (not (string= (with-current-buffer src (buffer-string))
-		      (with-current-buffer dst (buffer-string))))
-	(with-current-buffer src
-	  (copy-to-buffer dst (point-min) (point-max))))))
+(defun nix--replace-buffer-contents (src dst)
+  (if (fboundp 'replace-buffer-contents)
+      (with-current-buffer dst (replace-buffer-contents src))
+    (unless  (string= (with-current-buffer src (buffer-string))
+		      (with-current-buffer dst (buffer-string)))
+      (with-current-buffer src
+	(copy-to-buffer dst (point-min) (point-max))))))
 
 (defun nix--format-call (buf nixfmt-bin)
   "Format BUF using nixfmt."

nix-format.el

@@ -20,7 +20,7 @@
   (nix--process-json-nocheck "search" "--json"
 			     (unless use-flakes "--file") file
 			     (when no-cache "--no-cache")
-			     (unless (string= "" search) search)))
+			     (unless (string-empty-p search) search)))
 
 (defface nix-search-pname
   '((t :height 1.5

nix-search.el

@@ -22,8 +22,9 @@
   :group 'nix)
 
 (defcustom nix-store-path-omit-self t
-  "Do not list the current entry itself within sections of nix-store-path-mode."
-  :package-version '(nix-mode . "1.6.0"))
+  "Do not list the current entry itself within sections of `nix-store-path-mode'."
+  :package-version '(nix-mode . "1.6.0")
+  :type 'boolean)
 
 (defun nix-store-realise (path)
   "Realise a path asynchronously.