summaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2023-01-07 20:14:24 +0100
committerMathieu Othacehe <othacehe@gnu.org>2023-01-07 20:14:24 +0100
commit699d10414631dfa6238fab1360fc624de21be88c (patch)
tree5b04e3eaa9b755aaf6b74e10402c5a44d0f065ee /gnu/services
parent1b7e3196e4425adc4716832cf393abe1131d2a3d (diff)
Revert "services: base: Add extra-env support to guix-configuration."
This reverts commit 78a9b4f996ba18b4460ba380b87e9538007c27e0. It was pushed by error, while not reviewed yet.
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/base.scm10
1 files changed, 3 insertions, 7 deletions
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))))))