03/04: gnu: shepherd: Update to 0.8.0.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e3358a831e7d5d9e8dc614340e49ea5aeb11a7ff
Author: Ludovic Courtès <address@hidden>
AuthorDate: Tue Apr 21 16:06:53 2020 +0200

    gnu: shepherd: Update to 0.8.0.
    
    * gnu/packages/admin.scm (shepherd): Update to 0.8.0.
    * gnu/services/shepherd.scm (shepherd-configuration-file): Use
    'default-pid-file-timeout' instead of fiddling with '%pid-file-timeout'.
---
 gnu/packages/admin.scm    | 4 ++--
 gnu/services/shepherd.scm | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index bf5aa9d..c55a319 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -199,14 +199,14 @@ and provides a \"top-like\" mode (monitoring).")
 (define-public shepherd
   (package
     (name "shepherd")
-    (version "0.7.0")
+    (version "0.8.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/shepherd/shepherd-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "07j3vd0y8zab2nwbrwj0ahrfif1ldm5sjssn7m3dw4s307fsrfzx"))))
+                "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--localstatedir=/var")))
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index e99458d..2f30c6c 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -297,8 +297,7 @@ and return the resulting '.go' file."
           ;; everything slow.  Thus, increase the timeout compared to the
           ;; default 5s in the Shepherd 0.7.0.  See
           ;; <https://bugs.gnu.org/40572>.
-          ;; XXX: Use something better when the next Shepherd is out.
-          (set! (@@ (shepherd service) %pid-file-timeout) 30)
+          (default-pid-file-timeout 30)
 
           ;; Arrange to spawn a REPL if something goes wrong.  This is better
           ;; than a kernel panic.