[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: services: cuirass: Add load-path to cuirass configuration
From: |
Ludovic Courtès |
Subject: |
02/03: services: cuirass: Add load-path to cuirass configuration |
Date: |
Thu, 2 Feb 2017 08:05:03 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit eb122280a0b79d82ba0d59ac63dfb05cee37812f
Author: Mathieu Othacehe <address@hidden>
Date: Mon Jan 30 13:59:35 2017 +0100
services: cuirass: Add load-path to cuirass configuration
* gnu/services/cuirass.scm (<cuirass-configuration>): Add load-path field.
(cuirass-shepherd-service): Honor it.
* doc/guix.texi (Continuous Integration): Document it.
Signed-off-by: Ludovic Courtès <address@hidden>
---
doc/guix.texi | 4 ++++
gnu/services/cuirass.scm | 11 ++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 47456f3..6acde66 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13146,6 +13146,10 @@ from source.
@item @code{one-shot?} (default: @code{#f})
Only evaluate specifications and build derivations once.
address@hidden @code{load-path} (default: @code{'()})
+This allows users to define their own packages and make them visible to
+cuirass as in @command{guix build} command.
+
@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 1194133..237f71a 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -64,7 +64,9 @@
(use-substitutes? cuirass-configuration-use-substitutes? ;boolean
(default #f))
(one-shot? cuirass-configuration-one-shot? ;boolean
- (default #f)))
+ (default #f))
+ (load-path cuirass-configuration-load-path
+ (default '())))
(define (cuirass-shepherd-service config)
"Return a <shepherd-service> for the Cuirass service with CONFIG."
@@ -80,7 +82,8 @@
(port (cuirass-configuration-port config))
(specs (cuirass-configuration-specifications config))
(use-substitutes? (cuirass-configuration-use-substitutes? config))
- (one-shot? (cuirass-configuration-one-shot? config)))
+ (one-shot? (cuirass-configuration-one-shot? config))
+ (load-path (cuirass-configuration-load-path config)))
(list (shepherd-service
(documentation "Run Cuirass.")
(provision '(cuirass))
@@ -94,7 +97,9 @@
"--port" #$(number->string port)
"--interval" #$(number->string interval)
#$@(if use-substitutes? '("--use-substitutes") '())
- #$@(if one-shot? '("--one-shot") '()))
+ #$@(if one-shot? '("--one-shot") '())
+ #$@(if (null? load-path) '()
+ `("--load-path" ,(string-join load-path
":"))))
#:user #$user
#:group #$group
#:log-file #$log-file))