~ruther/guix-local

3b71b2dca78c3df3bb6cc952c0911293359a4247 — Ludovic Courtès 2 years ago 47d0346
gnu: cuirass: Update to 797b26a.

* gnu/packages/ci.scm (cuirass): Update to 797b26a.
* gnu/services/cuirass.scm (cuirass-activation): Create /var/run/cuirass.
2 files changed, 11 insertions(+), 5 deletions(-)

M gnu/packages/ci.scm
M gnu/services/cuirass.scm
M gnu/packages/ci.scm => gnu/packages/ci.scm +4 -4
@@ 58,8 58,8 @@
  #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)))

(define-public cuirass
  (let ((commit "613188072c468fe2ffa4e8f83b48aefeb2488a2c")
        (revision "18"))
  (let ((commit "797b26a4ef80dce278481b1cc3391791ef2cbbaf")
        (revision "19"))
    (package
      (name "cuirass")
      (version (git-version "1.1.0" revision commit))


@@ 72,7 72,7 @@
         (file-name (git-file-name name version))
         (sha256
          (base32
           "13ai3xmf62kx9ijc5imapcjwyvkhj2kxnh36chh3vbh3sxbbanzz"))))
           "10hs9nxl9xlnswm7qv8mw5s3rf65q4ip8ikqvgq5rprcv1lf26ad"))))
      (build-system gnu-build-system)
      (arguments
       `(#:modules ((guix build utils)


@@ 158,7 158,7 @@

             guix))
      (native-inputs
       (list autoconf automake pkg-config texinfo ephemeralpg))
       (list autoconf-2.71 automake pkg-config texinfo ephemeralpg))
      (native-search-paths
       ;; For HTTPS access, Cuirass itself honors these variables, with the
       ;; same semantics as Git and OpenSSL (respectively).

M gnu/services/cuirass.scm => gnu/services/cuirass.scm +7 -1
@@ 1,6 1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>


@@ 274,6 274,9 @@
                              (cuirass-remote-server-configuration-cache
                               remote-server)))
         (user           (cuirass-configuration-user config))
         ;; RUNSTATEDIR contains the "bridge" Unix-domain socket that 'cuirass
         ;; web' connects to to communicate with 'cuirass register'.
         (runstatedir    "/var/run/cuirass")
         (log            "/var/log/cuirass")
         (profile        (string-append "/var/guix/profiles/per-user/" user))
         (roots          (string-append profile "/cuirass"))


@@ 285,6 288,7 @@
          (mkdir-p #$cache)
          (mkdir-p #$log)
          (mkdir-p #$roots)
          (mkdir-p #$runstatedir)

          (when #$remote-cache
            (mkdir-p #$remote-cache))


@@ 295,6 299,8 @@
            (chown #$log uid gid)
            (chown #$roots uid gid)
            (chown #$profile uid gid)
            (chown #$runstatedir uid gid)
            (chmod #$runstatedir #o700)

            (when #$remote-cache
              (chown #$remote-cache uid gid)))))))