From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Othacehe Subject: [PATCH 2/2] services: cuirass: Add load-path to cuirass configuration Date: Mon, 30 Jan 2017 13:59:35 +0100 Message-ID: <20170130125935.5734-3-m.othacehe@gmail.com> References: <20170130125935.5734-1-m.othacehe@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYBYl-0006NS-Sw for guix-devel@gnu.org; Mon, 30 Jan 2017 07:59:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYBYl-0003Wt-2q for guix-devel@gnu.org; Mon, 30 Jan 2017 07:59:52 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cYBYk-0003Wf-T2 for guix-devel@gnu.org; Mon, 30 Jan 2017 07:59:51 -0500 Received: by mail-wm0-x242.google.com with SMTP id c85so77079194wmi.1 for ; Mon, 30 Jan 2017 04:59:50 -0800 (PST) In-Reply-To: <20170130125935.5734-1-m.othacehe@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/services/cuirass.scm (): Add load-path field. (cuirass-shepherd-service): Honor it. * doc/guix.texi (Continuous Integration): Document it. --- 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 4ba101094..887f2a28b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13104,6 +13104,10 @@ from source. @item @code{one-shot?} (default: @code{#f}) Only evaluate specifications and build derivations once. +@item @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 1194133f6..237f71a09 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 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)) -- 2.11.0