guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

14/14: services: ipfs: Adjust for Shepherd 0.9.


From: guix-commits
Subject: 14/14: services: ipfs: Adjust for Shepherd 0.9.
Date: Mon, 18 Apr 2022 17:27:38 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 6b677f4299f38ea70e1852388086ee95c2c48622
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Apr 16 22:27:13 2022 +0200

    services: ipfs: Adjust for Shepherd 0.9.
    
    This is a followup to e1f0c88ea221d846b5a533c4dc88e99e953af63e.
    
    * gnu/services/networking.scm (%ipfs-activation)[shepherd&co]: New
    variable.
    [container-gexp]: Use it.
---
 gnu/services/networking.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 5bb8638930..b302be5aaf 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -2074,12 +2074,19 @@ See yggdrasil -genconf for config options.")
         #$@(map (cute apply set-config!-gexp <>) settings)))
   (define inner-script
     (program-file "ipfs-activation-inner" inner-gexp))
+
+  (define shepherd&co
+    ;; 'make-forkexec-constructor/container' needs version 0.9 for
+    ;; #:supplementary-groups.
+    (cons shepherd-0.9
+          (list (lookup-package-input shepherd-0.9 "guile-fibers"))))
+
   ;; Run ipfs init and ipfs config from a container,
   ;; in case the IPFS daemon was compromised at some point
   ;; and ~/.ipfs is now a symlink to somewhere outside
   ;; %ipfs-home.
   (define container-gexp
-    (with-extensions (list shepherd)
+    (with-extensions shepherd&co
       (with-imported-modules (source-module-closure
                               '((gnu build shepherd)
                                 (gnu system file-systems)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]