diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-03-02 08:00:14 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-03-08 23:46:11 +0000 |
| commit | af96c1e0e42978594b27bcf957d75b304f107998 (patch) | |
| tree | 2d76fa557d5924740884da7da9b001c8201b01b4 | |
| parent | d8ab68b92941ca0286697b87a88254023a0b2dc9 (diff) | |
| download | patches-af96c1e0e42978594b27bcf957d75b304f107998.tar patches-af96c1e0e42978594b27bcf957d75b304f107998.tar.gz | |
services: cuirass: Allow passing extra command line options.
This is so that the options supported by the service configuration don't have
to always be changed. Generally though all options should be explicitly
supported and documented, so this is mostly to facilitate experimentation.
* gnu/services/cuirass.scm (<cuirass-configuration>): Add an extra-options
field.
(cuirass-shepherd-service): Pass the extra options to the shepherd servvices.
* doc/guix.texi (Continuous Integration): Document it.
| -rw-r--r-- | doc/guix.texi | 3 | ||||
| -rw-r--r-- | gnu/services/cuirass.scm | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index b192118566..1af80849cb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22450,6 +22450,9 @@ Only evaluate specifications and build derivations once. When substituting a pre-built binary fails, fall back to building packages locally. +@item @code{extra-options} (default: @code{'()}) +Extra options to pass when running the Cuirass processes. + @item @code{cuirass} (default: @code{cuirass}) The Cuirass package to use. @end table diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 7bfb021161..0f4f0f9948 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -77,7 +77,9 @@ (one-shot? cuirass-configuration-one-shot? ;boolean (default #f)) (fallback? cuirass-configuration-fallback? ;boolean - (default #f))) + (default #f)) + (extra-options cuirass-configuration-extra-options + (default '()))) (define (cuirass-shepherd-service config) "Return a <shepherd-service> for the Cuirass service with CONFIG." @@ -95,7 +97,8 @@ (specs (cuirass-configuration-specifications config)) (use-substitutes? (cuirass-configuration-use-substitutes? config)) (one-shot? (cuirass-configuration-one-shot? config)) - (fallback? (cuirass-configuration-fallback? config))) + (fallback? (cuirass-configuration-fallback? config)) + (extra-options (cuirass-configuration-extra-options config))) (list (shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) @@ -110,7 +113,8 @@ "--interval" #$(number->string interval) #$@(if use-substitutes? '("--use-substitutes") '()) #$@(if one-shot? '("--one-shot") '()) - #$@(if fallback? '("--fallback") '())) + #$@(if fallback? '("--fallback") '()) + #$@extra-options) #:environment-variables (list "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt" @@ -137,7 +141,8 @@ "--listen" #$host "--interval" #$(number->string interval) #$@(if use-substitutes? '("--use-substitutes") '()) - #$@(if fallback? '("--fallback") '())) + #$@(if fallback? '("--fallback") '()) + #$@extra-options) #:user #$user #:group #$group |