[PATCH 0/2] Add load-path support to cuirass.

[PATCH 0/2] Add load-path support to cuirass.

[Mathieu Othacehe]

Hello,

The point of the serie is to add load-path support to cuirass.
The first patch is updating cuirass to a version containing this commit :

https://notabug.org/mthl/cuirass/commit/5127c6797ca6eb5782f96f44c7c1d38263927f2b

The second patch adds support for load-path option in guix's cuirass service
configuration.

Thanks,

Mathieu

Mathieu Othacehe (2):
  gnu: cuirass: Update to 0.0.1 revision 4.
  services: cuirass: Add load-path to cuirass configuration

 doc/guix.texi            |  4 ++++
 gnu/packages/ci.scm      |  7 ++++---
 gnu/services/cuirass.scm | 11 ++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

-- 
2.11.0

[PATCH 1/2] gnu: cuirass: Update to 0.0.1 revision 4.

[Mathieu Othacehe]

* gnu/packages/ci.scm (cuirass): Update to 0.0.1 revision 4.
---
 gnu/packages/ci.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index 15a94c5ee..c25bc389c 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
+;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -186,8 +187,8 @@ their dependencies.")
       (license l:gpl3+))))
 
 (define-public cuirass
-  (let ((commit "d0a5801e397335bb44d8033e5deddf02c1cc99c2")
-        (revision "3"))
+  (let ((commit "f695c79eb3b93a0432901844c8ede16de39b8d07")
+        (revision "4"))
     (package
       (name "cuirass")
       (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@@ -199,7 +200,7 @@ their dependencies.")
                 (file-name (string-append name "-" version))
                 (sha256
                  (base32
-                  "0sa94dgp9w6av7i0a570fv9a9yq03jkxdrm5d75h6szsp1kiyw2i"))))
+                  "1zsj3l85d8jq7h9a0zfb2w5pyvlwkirgvis4bv60syhbpblfvmri"))))
       (build-system gnu-build-system)
       (arguments
        '(#:phases
-- 
2.11.0

[PATCH 2/2] services: cuirass: Add load-path to cuirass configuration

[Mathieu Othacehe]

* gnu/services/cuirass.scm (<cuirass-configuration>): 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 <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))
-- 
2.11.0

Re: [PATCH 0/2] Add load-path support to cuirass.

[Ludovic Courtès]

Hello,

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

> The point of the serie is to add load-path support to cuirass.
> The first patch is updating cuirass to a version containing this commit :
>
> https://notabug.org/mthl/cuirass/commit/5127c6797ca6eb5782f96f44c7c1d38263927f2b
>
> The second patch adds support for load-path option in guix's cuirass service
> configuration.
>
> Thanks,
>
> Mathieu
>
> Mathieu Othacehe (2):
>   gnu: cuirass: Update to 0.0.1 revision 4.
>   services: cuirass: Add load-path to cuirass configuration

Applied both.  Good to see improvements in this area!

Thank you!

Ludo’.