aboutsummaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-01-01 22:52:35 +0100
committerLudovic Courtès <ludo@gnu.org>2017-01-01 23:30:30 +0100
commit8de938d59aa48a43b71d9fa687d762c807f59136 (patch)
tree350fb689bef806e162c5afaaa9dd6c9fea981fc4 /gnu/services
parentfef494d27d52149812365e59d34e1ac3a97396c0 (diff)
downloadguix-8de938d59aa48a43b71d9fa687d762c807f59136.tar
guix-8de938d59aa48a43b71d9fa687d762c807f59136.tar.gz
services: cuirass: Allow for gexps in specifications.
* gnu/services/cuirass.scm (<cuirass-configuration>)[specifications]: Change default value to #~'(). (cuirass-shepherd-service): Remove conditional for "--specifications". Use 'scheme-file' instead of 'plain-file'. Change file name to "cuirass-specs.scm". * doc/guix.texi (Continuous Integration): Change the example to use a gexp where #:file refers to a file within Cuirass. Adjust documentation.
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/cuirass.scm13
1 files changed, 5 insertions, 8 deletions
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 67265e506e..4dc802fc8c 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
-;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -57,8 +57,8 @@
(default 60))
(database cuirass-configuration-database ;string (file-name)
(default "/var/run/cuirass/cuirass.db"))
- (specifications cuirass-configuration-specifications ;specification-alist
- (default '()))
+ (specifications cuirass-configuration-specifications
+ (default #~'())) ;gexp that evaluates to specification-alist
(use-substitutes? cuirass-configuration-use-substitutes? ;boolean
(default #f))
(one-shot? cuirass-configuration-one-shot? ;boolean
@@ -85,11 +85,8 @@
(start #~(make-forkexec-constructor
(list (string-append #$cuirass "/bin/cuirass")
"--cache-directory" #$cache-directory
- #$@(if (null? specs)
- '()
- (let ((str (format #f "'~S" specs)))
- (list "--specifications"
- (plain-file "specs.scm" str))))
+ "--specifications"
+ #$(scheme-file "cuirass-specs.scm" specs)
"--database" #$database
"--interval" #$(number->string interval)
#$@(if use-substitutes? '("--use-substitutes") '())