diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2023-01-07 19:12:30 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2023-01-09 17:15:28 +0100 |
| commit | 8b314efd50742a37fc157f623148d3e4e587c09d (patch) | |
| tree | fd466c401a6f4d0a9d4764249e2b987154069783 /gnu | |
| parent | de48bcee070b8d1ea6f3abe24be28d3b7d1aff68 (diff) | |
| download | guix-8b314efd50742a37fc157f623148d3e4e587c09d.tar.gz | |
services: base: Add environment support to guix-configuration.
* gnu/services/base.scm (<guix-configuration>)[extra-env]: New field. (guix-shepherd-service): Honor it. * doc/guix.texi (Base Services): Document it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/base.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 6993e1f174..08eea46dc6 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -198,6 +198,7 @@ guix-configuration-generate-substitute-key? guix-configuration-extra-options guix-configuration-log-file + guix-configuration-environment guix-extension guix-extension? @@ -1654,7 +1655,9 @@ archive' public keys, with GUIX." (http-proxy guix-http-proxy ;string | #f (default #f)) (tmpdir guix-tmpdir ;string | #f - (default #f))) + (default #f)) + (environment guix-configuration-environment ;list of strings + (default '()))) (define %default-guix-configuration (guix-configuration)) @@ -1710,7 +1713,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) + http-proxy tmpdir chroot-directories environment) (list (shepherd-service (documentation "Run the Guix daemon.") (provision '(guix-daemon)) @@ -1799,7 +1802,8 @@ proxy of 'guix-daemon'...~%") (if proxy (list (string-append "http_proxy=" proxy) (string-append "https_proxy=" proxy)) - '())) + '()) + '#$environment) #:log-file #$log-file)))) (stop #~(make-kill-destructor)))))) |