jmd pushed a commit to branch wip-installer
in repository guix.
commit 7f6686f4566aaac247afc5af4408fe7ee39a1cc0
Author: Ludovic Courtès <[email protected]>
Date: Tue Dec 20 10:23:37 2016 +0100
services: cuirass: Add 'cuirass' field.
* gnu/services/cuirass.scm (<cuirass-configuration>)[cuirass]: New
field.
(cuirass-shepherd-service): Honor it.
* doc/guix.texi (Continuous Integration): Document it.
---
doc/guix.texi | 3 +++
gnu/services/cuirass.scm | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index bb96385..389afe0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12025,6 +12025,9 @@ from source.
@item @code{one-shot?} (default: @code{#f})
Only evaluate specifications and build derivations once.
+
+@item @code{cuirass} (default: @code{cuirass})
+The Cuirass package to use.
@end table
@end deftp
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 91d78d1..0ecdccf 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -43,6 +43,8 @@
(define-record-type* <cuirass-configuration>
cuirass-configuration make-cuirass-configuration
cuirass-configuration?
+ (cuirass cuirass-configuration-cuirass ;package
+ (default cuirass))
(log-file cuirass-configuration-log-file ;string
(default "/var/log/cuirass.log"))
(cache-directory cuirass-configuration-cache-directory ;string (dir-name)
@@ -66,7 +68,8 @@
"Return a <shepherd-service> for the Cuirass service with CONFIG."
(and
(cuirass-configuration? config)
- (let ((cache-directory (cuirass-configuration-cache-directory config))
+ (let ((cuirass (cuirass-configuration-cuirass config))
+ (cache-directory (cuirass-configuration-cache-directory config))
(log-file (cuirass-configuration-log-file config))
(user (cuirass-configuration-user config))
(group (cuirass-configuration-group config))
