nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: guix: Support building in a directory besides '/tmp'. 

* gnu/services/base.scm (<guix-configuration>)[tmpdir]: New field.
(guix-shepherd-service): Use 'tmpdir' in #:environment-variables.
* doc/guix.texi (Base Services)[guix-configuration]: Document it.
This commit is contained in:
Leo Famulari 2017-02-23 12:08:02 -05:00
parent 94b28aed1e
commit b191f0a6c5
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/guix.texi
View File

@ -8615,6 +8615,9 @@ The lsof package to use.
The HTTP proxy used for downloading fixed-output derivations and The HTTP proxy used for downloading fixed-output derivations and
substitutes. substitutes.
@item @code{tmpdir} (default: @code{#f})
A directory path where the @command{guix-daemon} will perform builds.
@end table @end table
@end deftp @end deftp

7
gnu/services/base.scm
View File

@ -1116,6 +1116,8 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
(lsof guix-configuration-lsof ;<package> (lsof guix-configuration-lsof ;<package>
(default lsof)) (default lsof))
(http-proxy guix-http-proxy ;string | #f (http-proxy guix-http-proxy ;string | #f
(default #f))
(tmpdir guix-tmpdir ;string | #f
(default #f))) (default #f)))
(define %default-guix-configuration (define %default-guix-configuration
@ -1127,7 +1129,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
(($ <guix-configuration> guix build-group build-accounts (($ <guix-configuration> guix build-group build-accounts
authorize-key? keys authorize-key? keys
use-substitutes? substitute-urls extra-options use-substitutes? substitute-urls extra-options
log-file lsof http-proxy) log-file lsof http-proxy tmpdir)
(list (shepherd-service (list (shepherd-service
(documentation "Run the Guix daemon.") (documentation "Run the Guix daemon.")
(provision '(guix-daemon)) (provision '(guix-daemon))
@ -1147,6 +1149,9 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
(list (string-append "PATH=" #$lsof "/bin") (list (string-append "PATH=" #$lsof "/bin")
#$@(if http-proxy #$@(if http-proxy
(list (string-append "http_proxy=" http-proxy)) (list (string-append "http_proxy=" http-proxy))
'())
#$@(if tmpdir
(list (string-append "TMPDIR=" tmpdir))
'())) '()))
#:log-file #$log-file)) #:log-file #$log-file))