branch master updated: Revert "services: base: Add extra-env support to guix-configuration."

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 699d104146 Revert "services: base: Add extra-env support to 
guix-configuration."
699d104146 is described below

commit 699d10414631dfa6238fab1360fc624de21be88c
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Sat Jan 7 20:14:24 2023 +0100

    Revert "services: base: Add extra-env support to guix-configuration."
    
    This reverts commit 78a9b4f996ba18b4460ba380b87e9538007c27e0. It was pushed 
by
    error, while not reviewed yet.
---
 doc/guix.texi         |  4 ----
 gnu/services/base.scm | 10 +++-------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index e337945ba7..293c3016aa 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -18482,10 +18482,6 @@ herd set-http-proxy guix-daemon
 @item @code{tmpdir} (default: @code{#f})
 A directory path where the @command{guix-daemon} will perform builds.
 
-@item @code{extra-env} (default: @code{'()})
-Environment variables to be set before starting the daemon, as a list of
-@code{key=value} strings.
-
 @end table
 @end deftp
 
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 0b387ee0f5..6993e1f174 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -198,7 +198,6 @@
             guix-configuration-generate-substitute-key?
             guix-configuration-extra-options
             guix-configuration-log-file
-            guix-configuration-extra-env
 
             guix-extension
             guix-extension?
@@ -1655,9 +1654,7 @@ archive' public keys, with GUIX."
   (http-proxy       guix-http-proxy               ;string | #f
                     (default #f))
   (tmpdir           guix-tmpdir                   ;string | #f
-                    (default #f))
-  (extra-env        guix-configuration-extra-env  ;list of strings
-                    (default '())))
+                    (default #f)))
 
 (define %default-guix-configuration
   (guix-configuration))
@@ -1713,7 +1710,7 @@ proxy of 'guix-daemon'...~%")
     (guix build-group build-accounts authorize-key? authorized-keys
           use-substitutes? substitute-urls max-silent-time timeout
           log-compression discover? extra-options log-file
-          http-proxy tmpdir chroot-directories extra-env)
+          http-proxy tmpdir chroot-directories)
     (list (shepherd-service
            (documentation "Run the Guix daemon.")
            (provision '(guix-daemon))
@@ -1802,8 +1799,7 @@ proxy of 'guix-daemon'...~%")
                            (if proxy
                                (list (string-append "http_proxy=" proxy)
                                      (string-append "https_proxy=" proxy))
-                               '())
-                           '#$extra-env)
+                               '()))
 
                    #:log-file #$log-file))))
            (stop #~(make-kill-destructor))))))