[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode 54f28871a3 376/500: Fix issue #70
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode 54f28871a3 376/500: Fix issue #70 |
Date: |
Sat, 29 Jan 2022 08:27:26 -0500 (EST) |
branch: elpa/nix-mode
commit 54f28871a3306aab403ec98f4ff8765226604cb0
Author: Yilin Wei <yilin.wei10@gmail.com>
Commit: Yilin Wei <yilin.wei10@gmail.com>
Fix issue #70
---
nix-shell.el | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/nix-shell.el b/nix-shell.el
index d1754e7c4f..3c3df93bc2 100644
--- a/nix-shell.el
+++ b/nix-shell.el
@@ -32,7 +32,8 @@
"All nix-shell options."
:group 'nix)
-(defcustom nix-shell-inputs '(depsBuildBuild
+(defcustom nix-shell-inputs '(buildInputs
+ depsBuildBuild
depsBuildBuildPropagated
nativeBuildInputs
propagatedNativeBuildInputs
@@ -205,12 +206,14 @@ PKGS-FILE a file to use to get the packages."
(setq-local nix-shell-clear-environment t)
+ ;; We must start this before the callback otherwise the path is cleared
+ (eshell-mode)
+
(nix-shell--callback
(current-buffer)
(nix-instantiate
(nix-shell--with-packages-file packages pkgs-file) nil t))
- (eshell-mode)
buffer))
(defun nix-eshell (file &optional attr)
@@ -225,11 +228,13 @@ ATTR attribute to instantiate in NIX-FILE."
(setq-local nix-shell-clear-environment t)
+ ;; We must start this before the callback otherwise the path is cleared
+ (eshell-mode)
+
(nix-shell--callback
(current-buffer)
(nix-instantiate file attr t))
- (eshell-mode)
buffer))
;;;###autoload
- [nongnu] elpa/nix-mode 81e8c3dea6 032/500: cleanup formatting, (continued)
- [nongnu] elpa/nix-mode 81e8c3dea6 032/500: cleanup formatting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 09d40e95e2 037/500: Skip braces with hanging indents, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode f29d9865e4 055/500: Fixup hanging indents., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 55ed31214a 053/500: Add "in" for closing., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ec0546a41d 051/500: Tweak hanging indent, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 0f94476b7e 117/500: nix-syntax-match-antiquote: Handle case where point has the property, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 183d4212e2 134/500: Fix fontification bug, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 42632ee471 168/500: Remove misc/ folder, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 93bfb4428d 182/500: Add nix-build function., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9d4eb7d199 274/500: Make find-file-at-point support <nixpkgs>, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 54f28871a3 376/500: Fix issue #70,
ELPA Syncer <=
- [nongnu] elpa/nix-mode ef64fa293b 388/500: Set nix-version to nil, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 218c885d78 414/500: Merge pull request #116 from taku0/update-install-nix-action, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode d6e895969b 400/500: Set the 'LD_LIBRARY_PATH' environment variable for mkShell, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode c041115673 301/500: Fix failing test., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 01c53b7ff1 289/500: Merge pull request #66 from etu/add-travis-badge, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1d31733ef8 311/500: Add more function documentation, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode be06d675b8 315/500: Run tests for nix-indent-line and smie-indent-line, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode a33ccd4fd7 322/500: Add more issue test cases, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ce8f523eb6 330/500: Set the indent function to the value passed in in with-nix-mode-test, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 023a471576 329/500: Remove unnecessary while loop., ELPA Syncer, 2022/01/29