futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 78a9b4f996ba18b4460ba380b87e9538007c27e0. It was pushed by
error, while not reviewed yet.
This commit is contained in:
Mathieu Othacehe 2023-01-07 20:14:24 +01:00
parent 1b7e3196e4
commit 699d104146
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -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

10
gnu/services/base.scm
View File

@ -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))))))