From 9d327c3acc6bb01bc5a1da938698ad883c6c6805 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 3 Jan 2022 17:09:34 +0300 Subject: [PATCH] fix(emacs-pkgs/nix-util): Fix nix/sly-from-depot function 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 Reviewed-by: sterni Reviewed-by: grfn --- tools/emacs-pkgs/nix-util/nix-util.el | 10 ++++------ 1 file 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 4b9dd31a0..855b53a74 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 {}; in depot.nix.buildLisp.sbclWith [ depot.%s ]" attribute)) - ;; TODO(tazjin): use - (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 {}).%s.repl" attribute)) + (command (list "nix-build" "--no-out-link" "-I" (format "depot=%s" tvl-depot-path) "-E" expression))) (message "Acquiring Lisp for .%s" attribute) (make-process :name (format "depot-nix-build/%s" attribute) :buffer outbuf