branch: elpa/nix-mode
commit 327175e768eed6d9840b85378896f0a652b37e74
Merge: 56748ac556 f38d4e9b37
Author: Matthew Bauer <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #138 from phikal/master
Remove f dependency
---
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 7eede182d1..1d79abea5d 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"))
+;; Package-Requires: ((emacs "25.1"))
;; This file is NOT part of GNU Emacs.
diff --git a/nix.el b/nix.el
index 29cfe66dd2..59e6e4c2e7 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))))
