me
/
guix
Archived
1
0
Fork 0

services: nar-herder: Support extra environment vars.

* gnu/services/guix.scm (nar-herder-configuration-extra-environment-variables):
New procedure.
(nar-herder-shepherd-services): Pass the environment variables to the
shepherd.
* doc/guix.texi (Guix Services): Document it.
master
Christopher Baines 2023-05-13 11:23:48 +01:00
parent cc47c5277d
commit 9a6bbea9d4
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
2 changed files with 12 additions and 3 deletions

View File

@ -37803,6 +37803,9 @@ Number of cached nars to generate at a time.
Location to fetch nars from when computing cached compressions. By
default, the storage location will be used.
@item @code{extra-environment-variables} (default: @code{'()})
Extra environment variables to set via the shepherd service.
@end table
@end deftp

View File

@ -133,6 +133,7 @@
nar-herder-configuration-cached-compression-min-uses
nar-herder-configuration-cached-compression-workers
nar-herder-configuration-cached-compression-nar-source
nar-herder-configuration-extra-environment-variables
nar-herder-cached-compression-configuration
nar-herder-cached-compression-configuration?
@ -858,7 +859,10 @@ ca-certificates.crt file in the system profile."
(default 2))
(cached-compression-nar-source
nar-herder-configuration-cached-compression-nar-source
(default #f)))
(default #f))
(extra-environment-variables
nar-herder-configuration-extra-environment-variables
(default '())))
(define-record-type* <nar-herder-cached-compression-configuration>
nar-herder-cached-compression-configuration
@ -906,7 +910,8 @@ ca-certificates.crt file in the system profile."
storage storage-limit storage-nar-removal-criteria
ttl negative-ttl log-level
cached-compressions cached-compression-min-uses
cached-compression-workers cached-compression-nar-source)
cached-compression-workers cached-compression-nar-source
extra-environment-variables)
(unless (or mirror storage)
(error "nar-herder: mirror or storage must be set"))
@ -975,7 +980,8 @@ ca-certificates.crt file in the system profile."
#:environment-variables
`(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
"LC_ALL=en_US.utf8")
"LC_ALL=en_US.utf8"
#$@extra-environment-variables)
#:log-file "/var/log/nar-herder/server.log"))
(stop #~(make-kill-destructor))))))