summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-09-29 10:00:04 +0200
committerLudovic Courtès <ludo@gnu.org>2017-09-29 10:01:02 +0200
commit1501cb55e9b49fa648a26573c5a0d492605ea7ad (patch)
tree42e0a1352a0eba93651fe0ecde33e5add9d5ba25 /gnu
parentbc01c89171b0a9a7b880aa724d06a31074396b2d (diff)
downloadguix-1501cb55e9b49fa648a26573c5a0d492605ea7ad.tar.gz
gnu: cuirass: Update to latest snapshot.
This fixes mishandling of 'GIT_SSL_CAINFO'.

* gnu/packages/ci.scm (cuirass): Update to commit 9cfea9f.
[native-search-paths]: New field.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/ci.scm17
1 files changed, 14 insertions, 3 deletions
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index a6057a76e2..2a22f222d3 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -187,8 +187,8 @@ their dependencies.")
       (license l:gpl3+))))
 
 (define-public cuirass
-  (let ((commit "2a4d493e28100b8eca7d23300dd872c9f99e1f16")
-        (revision "9"))
+  (let ((commit "9cfea9fe2e3ca6a3d1b832a6ec217426ec973c93")
+        (revision "10"))
     (package
       (name "cuirass")
       (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@@ -200,7 +200,7 @@ their dependencies.")
                 (file-name (string-append name "-" version))
                 (sha256
                  (base32
-                  "0hi7x25ya8wydrfj9jd9zb351mw8pgxxxwgxxdn5kds7qvhxr26v"))))
+                  "177klidmsw12kjk9dzawc0bqcwqlplgx45m87qpgjfx3cnk28i2b"))))
       (build-system gnu-build-system)
       (arguments
        '(#:modules ((guix build utils)
@@ -268,6 +268,17 @@ their dependencies.")
          ("automake" ,automake)
          ("pkg-config" ,pkg-config)
          ("texinfo" ,texinfo)))
+      (native-search-paths
+       ;; For HTTPS access, Cuirass itself honors these variables, with the
+       ;; same semantics as Git and OpenSSL (respectively).
+       (list (search-path-specification
+              (variable "GIT_SSL_CAINFO")
+              (file-type 'regular)
+              (separator #f)                      ;single entry
+              (files '("etc/ssl/certs/ca-certificates.crt")))
+             (search-path-specification
+              (variable "SSL_CERT_DIR")
+              (files '("etc/ssl/certs")))))
       (synopsis "Continuous integration system")
       (description
        "Cuirass is a continuous integration tool using GNU Guix.  It is