[nongnu] elpa/nix-mode b1257d3ea6 461/500: Merge branch 'master' into store-path

[ELPA Syncer]

branch: elpa/nix-mode
commit b1257d3ea6821cad74b0e18fc870a47ec34fd5a4
Merge: e645310c88 327175e768
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge branch 'master' into store-path
---
 nix-mode.el | 2 +-
 nix.el      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nix-mode.el b/nix-mode.el
index ff060679c8..31993f386c 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -4,7 +4,7 @@
 ;; Homepage: https://github.com/NixOS/nix-mode
 ;; Version: 1.4.4
 ;; Keywords: nix, languages, tools, unix
-;; Package-Requires: ((emacs "25.1") (f "0.20.0") magit-section)
+;; Package-Requires: ((emacs "25.1") magit-section)
 
 ;; This file is NOT part of GNU Emacs.
 
diff --git a/nix.el b/nix.el
index 3919a3670d..bf5887b27e 100644
--- a/nix.el
+++ b/nix.el
@@ -18,7 +18,6 @@
 
 (require 'pcomplete)
 (require 'json)
-(require 'f)
 
 (defgroup nix nil
   "Nix-related customizations"
@@ -331,7 +330,9 @@ OPTIONS a list of options to accept."
     (let* ((tmpfile  (make-temp-file "nix--process-stderr"))
         (cleaned-args (seq-filter #'stringp args))
         (exitcode (apply #'call-process `(,nix-executable nil (t ,tmpfile) nil 
,@cleaned-args )))
-        (stderr (f-read-text tmpfile)))
+        (stderr (with-temp-buffer
+                  (insert-file-contents tmpfile)
+                  (buffer-string))))
       (delete-file tmpfile)
       (list (buffer-string) stderr exitcode))))