diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-01-03T14·09+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-01-04T18·02+0000 |
| commit | 9d327c3acc6bb01bc5a1da938698ad883c6c6805 (patch) | |
| tree | 416a67df651f263292bcffe42fa6ce6ac86f6f3f | |
| parent | f7235d10e700206d070e9f5e5ebe9c1c6fc5784e (diff) | |
fix(emacs-pkgs/nix-util): Fix nix/sly-from-depot function r/3516
A formatting error broke this at some point (the let clauses were outside of the definition list). Change-Id: Iaa2dc9ad02d2f7e909ca9bf28705e782ad26060b Reviewed-on: https://cl.tvl.fyi/c/depot/+/4765 Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi>
| -rw-r--r-- | tools/emacs-pkgs/nix-util/nix-util.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/emacs-pkgs/nix-util/nix-util.el b/tools/emacs-pkgs/nix-util/nix-util.el index 4b9dd31a022e..855b53a749b9 100644 --- a/tools/emacs-pkgs/nix-util/nix-util.el +++ b/tools/emacs-pkgs/nix-util/nix-util.el @@ -68,7 +68,7 @@ (defun nix/sly-from-depot (attribute) "Start a Sly REPL configured with a Lisp matching a derivation - from my depot. + from the depot. The derivation invokes nix.buildLisp.sbclWith and is built asynchronously. The build output is included in the error @@ -76,11 +76,9 @@ (interactive "sAttribute: ") (lexical-let* ((outbuf (get-buffer-create (format "*depot-out/%s*" attribute))) - (errbuf (get-buffer-create (format "*depot-errors/%s*" attribute))) - (expression (format "let depot = import <depot> {}; in depot.nix.buildLisp.sbclWith [ depot.%s ]" attribute)) - ;; TODO(tazjin): use <depot> - (command (list "nix-build" "--no-out-link" "-I" (format "depot=%s" nix-depot-path) "-E" expression))) - + (errbuf (get-buffer-create (format "*depot-errors/%s*" attribute))) + (expression (format "(import <depot> {}).%s.repl" attribute)) + (command (list "nix-build" "--no-out-link" "-I" (format "depot=%s" tvl-depot-path) "-E" expression))) (message "Acquiring Lisp for <depot>.%s" attribute) (make-process :name (format "depot-nix-build/%s" attribute) :buffer outbuf |