~ruther/guix-local

b0b9f6e0a62852a0b4d0a86d9e8427dd7d36a714 — Ludovic Courtès 10 years ago 7191adc
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.
2 files changed, 8 insertions(+), 1 deletions(-)

M doc/guix.texi
M gnu/services/base.scm
M doc/guix.texi => doc/guix.texi +3 -0
@@ 6217,6 6217,9 @@ Whether to authorize the substitute key for @code{hydra.gnu.org}
@item @code{use-substitutes?} (default: @code{#t})
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{'()})
List of extra command-line options for @command{guix-daemon}.


M gnu/services/base.scm => gnu/services/base.scm +5 -1
@@ 751,6 751,8 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
                    (default #t))
  (use-substitutes? guix-configuration-use-substitutes? ;Boolean
                    (default #t))
  (substitute-urls  guix-configuration-substitute-urls ;list of strings
                    (default %default-substitute-urls))
  (extra-options    guix-configuration-extra-options ;list of strings
                    (default '()))
  (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."
  (match config
    (($ <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
            (documentation "Run the Guix daemon.")
            (provision '(guix-daemon))


@@ 777,6 780,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
                      #$@(if use-substitutes?
                             '()
                             '("--no-substitutes"))
                      "--substitute-urls" #$(string-join substitute-urls)
                      #$@extra-options)

                ;; Add 'lsof' (for the GC) and 'lsh' (for offloading) to the