diff options
author | Alex Kost <alezost@gmail.com> | 2015-08-13 10:51:31 +0300 |
---|---|---|
committer | Alex Kost <alezost@gmail.com> | 2015-08-30 18:26:02 +0300 |
commit | 5e53b0c5a9e1c693d46bdaf24e6b5ce498410da6 (patch) | |
tree | a0ba0ee53b904458cf223e6dee7597dfef89ec47 /emacs | |
parent | caa6732e967ef4e397533d1cff9ba5626b2b4131 (diff) | |
download | guix-5e53b0c5a9e1c693d46bdaf24e6b5ce498410da6.tar guix-5e53b0c5a9e1c693d46bdaf24e6b5ce498410da6.tar.gz |
emacs: Add code to run guix command in REPL.
* emacs/guix-base.el (guix-run-command-in-repl, guix-command-output,
guix-help-string): New functions.
* emacs/guix-main.scm (guix-command, guix-command-output, help-string):
New procedures.
Diffstat (limited to 'emacs')
-rw-r--r-- | emacs/guix-base.el | 21 | ||||
-rw-r--r-- | emacs/guix-main.scm | 18 |
2 files changed, 39 insertions, 0 deletions
diff --git a/emacs/guix-base.el b/emacs/guix-base.el index 4c7782dd53..d1593e285d 100644 --- a/emacs/guix-base.el +++ b/emacs/guix-base.el @@ -1085,6 +1085,27 @@ FILE. With a prefix argument, also prompt for PROFILE." operation-buffer))) +;;; Executing guix commands + +(defun guix-run-command-in-repl (args) + "Execute 'guix ARGS ...' command in Guix REPL." + (guix-eval-in-repl + (apply #'guix-make-guile-expression + 'guix-command args))) + +(defun guix-command-output (args) + "Return string with 'guix ARGS ...' output." + (guix-eval-read + (apply #'guix-make-guile-expression + 'guix-command-output args))) + +(defun guix-help-string (&optional commands) + "Return string with 'guix COMMANDS ... --help' output." + (guix-eval-read + (apply #'guix-make-guile-expression + 'help-string commands))) + + ;;; Pull (defcustom guix-update-after-pull t diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm index 341657d931..bd42f8fc21 100644 --- a/emacs/guix-main.scm +++ b/emacs/guix-main.scm @@ -931,6 +931,24 @@ GENERATIONS is a list of generation numbers." (package-source-derivation->store-path derivation)))))) +;;; Executing guix commands + +(define (guix-command . args) + "Run 'guix ARGS ...' command." + (catch 'quit + (lambda () (apply run-guix args)) + (const #t))) + +(define (guix-command-output . args) + "Return string with 'guix ARGS ...' output." + (with-output-to-string + (lambda () (apply guix-command args)))) + +(define (help-string . commands) + "Return string with 'guix COMMANDS ... --help' output." + (apply guix-command-output `(,@commands "--help"))) + + ;;; Lists of packages, lint checkers, etc. (define (graph-type-names) |