diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-10-17 19:08:53 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-10-17 19:08:53 -0400 |
| commit | ccb522324bd99cc379ada4a1da5b8bcfd7d12c5b (patch) | |
| tree | bd73bf8f8dabc046c12c53295b18daad49379887 /emacs/guix-command.el | |
| parent | 5fba12ecd3146e17d826167b6b9ffdfcbe2a49c9 (diff) | |
| parent | 9e2592a3466c72dbfb64494e1316ce8af1554647 (diff) | |
| download | patches-ccb522324bd99cc379ada4a1da5b8bcfd7d12c5b.tar patches-ccb522324bd99cc379ada4a1da5b8bcfd7d12c5b.tar.gz | |
Merge branch 'master' into dbus-update
Diffstat (limited to 'emacs/guix-command.el')
| -rw-r--r-- | emacs/guix-command.el | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/emacs/guix-command.el b/emacs/guix-command.el index b679ad9b1e..1a42594b68 100644 --- a/emacs/guix-command.el +++ b/emacs/guix-command.el @@ -249,7 +249,8 @@ to be modified." (guix-command-define-argument-improver guix-command-improve-system-argument - '(("vm-image" :char ?V) + '(("disk-image" :char ?D) + ("vm-image" :char ?V) ("--on-error" :char ?E) ("--no-grub" :char ?g) ("--full-boot" :char ?b))) @@ -498,15 +499,17 @@ to be modified." "List of default 'execute' action arguments.") (defvar guix-command-additional-execute-arguments - `((("build") - ,(guix-command-make-argument - :name "log" :char ?l :doc "View build log")) - (("graph") - ,(guix-command-make-argument - :name "view" :char ?v :doc "View graph")) - (("size") - ,(guix-command-make-argument - :name "view" :char ?v :doc "View map"))) + (let ((graph-arg (guix-command-make-argument + :name "view" :char ?v :doc "View graph"))) + `((("build") + ,(guix-command-make-argument + :name "log" :char ?l :doc "View build log")) + (("graph") ,graph-arg) + (("size") + ,(guix-command-make-argument + :name "view" :char ?v :doc "View map")) + (("system" "dmd-graph") ,graph-arg) + (("system" "extension-graph") ,graph-arg))) "Alist of guix commands and additional 'execute' action arguments.") (defun guix-command-execute-arguments (commands) @@ -530,7 +533,11 @@ to be modified." (("graph") ("view" . guix-run-view-graph)) (("size") - ("view" . guix-run-view-size-map))) + ("view" . guix-run-view-size-map)) + (("system" "dmd-graph") + ("view" . guix-run-view-graph)) + (("system" "extension-graph") + ("view" . guix-run-view-graph))) "Alist of guix commands and alists of special executers for them. See also `guix-command-default-executors'.") |