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

services: 'guix-configuration' has a 'substitute-urls' field. 

* gnu/services/base.scm (<guix-configuration>)[substitute-urls]: New
  field.
  (guix-dmd-service): Honor it.
* doc/guix.texi (Base Services): Document it.
master
Ludovic Courtès 2015-10-28 18:15:49 +01:00
parent 7191adc5cf
commit b0b9f6e0a6
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/guix.texi
View File

@ -6217,6 +6217,9 @@ Whether to authorize the substitute key for @code{hydra.gnu.org}
@item @code{use-substitutes?} (default: @code{#t}) @item @code{use-substitutes?} (default: @code{#t})
Whether to use substitutes. Whether to use substitutes.
@item @code{substitute-urls} (default: @var{%default-substitute-urls})
The list of URLs where to look for substitutes by default.
@item @code{extra-options} (default: @code{'()}) @item @code{extra-options} (default: @code{'()})
List of extra command-line options for @command{guix-daemon}. List of extra command-line options for @command{guix-daemon}.

6
gnu/services/base.scm
View File

@ -751,6 +751,8 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
(default #t)) (default #t))
(use-substitutes? guix-configuration-use-substitutes? ;Boolean (use-substitutes? guix-configuration-use-substitutes? ;Boolean
(default #t)) (default #t))
(substitute-urls guix-configuration-substitute-urls ;list of strings
(default %default-substitute-urls))
(extra-options guix-configuration-extra-options ;list of strings (extra-options guix-configuration-extra-options ;list of strings
(default '())) (default '()))
(lsof guix-configuration-lsof ;<package> (lsof guix-configuration-lsof ;<package>
@ -765,7 +767,8 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
"Return a <dmd-service> for the Guix daemon service with CONFIG." "Return a <dmd-service> for the Guix daemon service with CONFIG."
(match config (match config
(($ <guix-configuration> guix build-group build-accounts authorize-key? (($ <guix-configuration> guix build-group build-accounts authorize-key?
use-substitutes? extra-options lsof lsh) use-substitutes? substitute-urls extra-options
lsof lsh)
(list (dmd-service (list (dmd-service
(documentation "Run the Guix daemon.") (documentation "Run the Guix daemon.")
(provision '(guix-daemon)) (provision '(guix-daemon))
@ -777,6 +780,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
#$@(if use-substitutes? #$@(if use-substitutes?
'() '()
'("--no-substitutes")) '("--no-substitutes"))
"--substitute-urls" #$(string-join substitute-urls)
#$@extra-options) #$@extra-options)
;; Add 'lsof' (for the GC) and 'lsh' (for offloading) to the ;; Add 'lsof' (for the GC) and 'lsh' (for offloading) to the