guix-commits
[Top][All Lists]
Advanced

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

02/02: services: guix: Do not embed the host (guix config).


From: guix-commits
Subject: 02/02: services: guix: Do not embed the host (guix config).
Date: Wed, 4 Nov 2020 18:08:42 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit f7d0a63ddabe864e26bbff8e633371e6ae856845
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Nov 4 23:58:55 2020 +0100

    services: guix: Do not embed the host (guix config).
    
    Fixes a bug whereby different users would get different derivations for
    the same service.
    
    * gnu/services/base.scm (guix-shepherd-service): In 'start' method, do
    not embed (guix config).
---
 gnu/services/base.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index f1298c3..499e50b 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1570,8 +1570,10 @@ proxy of 'guix-daemon'...~%")
                       (ice-9 match)
                       (gnu build shepherd)))
            (start
-            (with-imported-modules (source-module-closure
-                                    '((gnu build shepherd)))
+            (with-imported-modules `(((guix config) => ,(make-config.scm))
+                                     ,@(source-module-closure
+                                        '((gnu build shepherd))
+                                        #:select? not-config?))
               #~(lambda args
                   (define proxy
                     ;; HTTP/HTTPS proxy.  The 'http_proxy' variable is set by



reply via email to

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