>From c6825b189f7b5d908c5fbe36d933fbe187cbc4bd Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 3 Mar 2016 12:55:21 +0300 Subject: [PATCH 2/2] emacs: hydra: Use '-' to separate job names and version numbers. * emacs/guix-hydra.el (guix-hydra-job-name-specification): New procedure. * emacs/guix-ui-package.el (guix-package-info-insert-systems) (guix-package-list-latest-builds): Use it. --- emacs/guix-hydra.el | 4 ++++ emacs/guix-ui-package.el | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/emacs/guix-hydra.el b/emacs/guix-hydra.el index 4294839..9f876e7 100644 --- a/emacs/guix-hydra.el +++ b/emacs/guix-hydra.el @@ -36,6 +36,10 @@ (concat ".*\\." (regexp-opt guix-help-system-types) "\\'") "Regexp matching a full name of Hydra job (including system).") +(defun guix-hydra-job-name-specification (name version) + "Return Hydra's job name specification by NAME and VERSION." + (concat name "-" version)) + (defun guix-hydra-message (entries search-type &rest _) "Display a message after showing Hydra ENTRIES." ;; XXX Add more messages maybe. diff --git a/emacs/guix-ui-package.el b/emacs/guix-ui-package.el index 56aa64f..9d81c61 100644 --- a/emacs/guix-ui-package.el +++ b/emacs/guix-ui-package.el @@ -34,6 +34,7 @@ (require 'guix-guile) (require 'guix-entry) (require 'guix-utils) +(require 'guix-hydra) (require 'guix-hydra-build) (require 'guix-read) (require 'guix-license) @@ -388,7 +389,7 @@ formatted with this string, an action button is inserted.") :system (button-label btn)))) (apply #'guix-hydra-build-get-display 'latest args))) - 'job-name (guix-package-name-specification + 'job-name (guix-hydra-job-name-specification (guix-entry-value entry 'name) (guix-entry-value entry 'version)))) @@ -776,7 +777,7 @@ for all ARGS." (interactive (let ((entry (guix-list-current-entry))) (guix-hydra-build-latest-prompt-args - :job (guix-package-name-specification + :job (guix-hydra-job-name-specification (guix-entry-value entry 'name) (guix-entry-value entry 'version))))) (apply #'guix-hydra-latest-builds number args)) -- 2.6.3