diff options
| -rw-r--r-- | doc/emacs.texi | 24 | ||||
| -rw-r--r-- | emacs/guix-devel.el | 40 | ||||
| -rw-r--r-- | emacs/guix-guile.el | 22 |
3 files changed, 86 insertions, 0 deletions
diff --git a/doc/emacs.texi b/doc/emacs.texi index d44d329c5c..b6f2701bc4 100644 --- a/doc/emacs.texi +++ b/doc/emacs.texi @@ -659,4 +659,28 @@ want to use a module it defines, so you switch to the Geiser REPL and write @code{,use (some module)} there. You may just use this command instead (@code{guix-devel-use-module}). +@item C-c . b +Build a package defined by the current variable definition. The +building process is run in the current Geiser REPL. If you modified the +current package definition, don't forget to reevaluate it before calling +this command---for example, with @kbd{C-M-x} (@pxref{To eval or not to +eval,,, geiser, Geiser User Manual}) +(@code{guix-devel-build-package-definition}). + @end table + +Unluckily, there is a limitation related to long-running REPL commands. +When there is a running process in a Geiser REPL, you are not supposed +to evaluate anything in a scheme buffer, because this will ``freeze'' +the REPL: it will stop producing any output (however, the evaluating +process will continue---you will just not see any progress anymore). Be +aware: even moving the point in a scheme buffer may ``break'' the REPL +if Autodoc (@pxref{Autodoc and friends,,, geiser, Geiser User Manual}) +is enabled (which is the default). + +So you have to postpone editing your scheme buffers until the running +evaluation will be finished in the REPL. + +Alternatively, to avoid this limitation, you may just run another Geiser +REPL, and while something is being evaluated in the previous REPL, you +can continue editing a scheme file with the help of the current one. diff --git a/emacs/guix-devel.el b/emacs/guix-devel.el index ed82e330de..6de49be3e6 100644 --- a/emacs/guix-devel.el +++ b/emacs/guix-devel.el @@ -27,6 +27,7 @@ (require 'guix-guile) (require 'guix-geiser) (require 'guix-utils) +(require 'guix-base) (defgroup guix-devel nil "Settings for Guix development utils." @@ -55,8 +56,47 @@ Interactively, use the module defined by the current scheme file." (interactive) (guix-copy-as-kill (guix-guile-current-module))) +(defun guix-devel-setup-repl (&optional repl) + "Setup REPL for using `guix-devel-...' commands." + (guix-devel-use-modules "(guix monad-repl)" + "(guix scripts)" + "(guix store)") + ;; Without this workaround, the build output disappears. See + ;; <https://github.com/jaor/geiser/issues/83> for details. + (guix-geiser-eval-in-repl + "(current-build-output-port (current-error-port))" + repl 'no-history 'no-display)) + +(defvar guix-devel-repl-processes nil + "List of REPL processes configured by `guix-devel-setup-repl'.") + +(defun guix-devel-setup-repl-maybe (&optional repl) + "Setup (if needed) REPL for using `guix-devel-...' commands." + (let ((process (get-buffer-process (or repl (guix-geiser-repl))))) + (when (and process + (not (memq process guix-devel-repl-processes))) + (guix-devel-setup-repl repl) + (push process guix-devel-repl-processes)))) + +(defun guix-devel-build-package-definition () + "Build a package defined by the current top-level variable definition." + (interactive) + (let ((def (guix-guile-current-definition))) + (guix-devel-setup-repl-maybe) + (guix-devel-use-modules (guix-guile-current-module)) + (when (or (not guix-operation-confirm) + (guix-operation-prompt (format "Build '%s'?" def))) + (guix-geiser-eval-in-repl + (concat ",run-in-store " + (guix-guile-make-call-expression + "build-package" def + "#:use-substitutes?" (guix-guile-boolean + guix-use-substitutes) + "#:dry-run?" (guix-guile-boolean guix-dry-run))))))) + (defvar guix-devel-keys-map (let ((map (make-sparse-keymap))) + (define-key map (kbd "b") 'guix-devel-build-package-definition) (define-key map (kbd "k") 'guix-devel-copy-module-as-kill) (define-key map (kbd "u") 'guix-devel-use-module) map) diff --git a/emacs/guix-guile.el b/emacs/guix-guile.el index c21d27fca2..35a97d77a3 100644 --- a/emacs/guix-guile.el +++ b/emacs/guix-guile.el @@ -26,6 +26,23 @@ (require 'geiser-guile) +(defvar guix-guile-definition-regexp + (rx bol "(define" + (zero-or-one "*") + (zero-or-one "-public") + (one-or-more space) + (zero-or-one "(") + (group (one-or-more (or word (syntax symbol))))) + "Regexp used to find the guile definition.") + +(defun guix-guile-current-definition () + "Return string with name of the current top-level guile definition." + (save-excursion + (beginning-of-defun) + (if (looking-at guix-guile-definition-regexp) + (match-string-no-properties 1) + (error "Couldn't find the current definition")))) + (defun guix-guile-current-module () "Return a string with the current guile module. Return nil, if current buffer does not define a module." @@ -37,6 +54,11 @@ Return nil, if current buffer does not define a module." (re-search-forward geiser-guile--module-re nil t)) (match-string-no-properties 1)))) +(defun guix-guile-boolean (arg) + "Return a string with guile boolean value. +Transform elisp ARG (nil or non-nil) to the guile boolean (#f or #t)." + (concat "#" (prin1-to-string (if arg 't 'f)))) + (defun guix-guile-make-call-expression (proc &rest args) "Return \"(PROC ARGS ...)\" string. PROC and ARGS should be strings." |