[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode d13d70b37d 377/500: Merge pull request #102 from
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode d13d70b37d 377/500: Merge pull request #102 from yilinwei/master |
Date: |
Sat, 29 Jan 2022 08:27:27 -0500 (EST) |
branch: elpa/nix-mode
commit d13d70b37df143abbf602fe6debe47dbe3d21e66
Merge: dc298e77b6 54f28871a3
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #102 from yilinwei/master
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 32929d9aed 024/500: Indent relative for string, (continued)
- [nongnu] elpa/nix-mode 32929d9aed 024/500: Indent relative for string, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9ab56cd6c9 035/500: Refactor indenting, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 65d0b6471f 039/500: Add more font lock constants., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 5e61391ca1 047/500: Merge branch 'lets', ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode ddf091708b 353/500: Merge pull request #87 from conao3/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode abf54fb448 354/500: Emacs 25 is now the minimum version required, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode de6ef0d0c7 355/500: Give "-" the "symbol" character class, since it is a legal symbol constituent, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 28e83dd56b 360/500: Don’t overwrite smie-indent-exps & smie-indent-close, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9f24153d67 367/500: Remove redundant case in tokenizer., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode b4518ae3ee 374/500: fixed a typo, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode d13d70b37d 377/500: Merge pull request #102 from yilinwei/master,
ELPA Syncer <=
- [nongnu] elpa/nix-mode a00b3f776d 384/500: Merge pull request #103 from yilinwei/patch-1, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode bb0b49e3ac 408/500: Merge pull request #112 from leungbk/makefile-load-path, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7d09073976 424/500: Merge pull request #121 from znewman01/fixbuild, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 4941961c75 059/500: Get rid of extra hanging indent matches., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode c577957d66 347/500: Merge pull request #85 from NixOS/fix-84, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode cccd68768b 319/500: Install info page to the right location, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode e820157994 338/500: Merge pull request #82 from jabranham/comp-warns, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 7556c032dc 421/500: Use the located nixfmt binary for formatting., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode df4ba688a7 435/500: Merge branch 'nix-search-updates', ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 4528033194 018/500: Add "nix-mode-reload" function., ELPA Syncer, 2022/01/29