civodul pushed a commit to branch master
in repository guix.
commit e463ee4c7bd44a7fdc372972fbc1d1ae8140f31b
Author: Ludovic Courtès <[email protected]>
AuthorDate: Thu Oct 8 09:32:40 2020 +0200
doc: Improve choice of options in service examples.
* doc/guix.texi (Using the Configuration System): In example, set
'substitute-urls' rather than 'use-substitutes?', and set 'auto-login'
for 'mingetty-configuration'.
(Service Types and Services): In example, show 'extra-options' rather
than 'use-substitutes?'.
---
doc/guix.texi | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 2b1ffbc..3fc76c8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12062,11 +12062,15 @@ following in your operating system declaration:
(guix-service-type config =>
(guix-configuration
(inherit config)
- (use-substitutes? #f)
- (extra-options '("--gc-keep-derivations"))))
+ ;; Fetch substitutes from example.org.
+ (substitute-urls
+ (list "https://example.org/guix";
+ "https://ci.guix.gnu.org";))))
(mingetty-service-type config =>
(mingetty-configuration
- (inherit config)))))
+ (inherit config)
+ ;; Automatially log in as "guest".
+ (auto-login "guest")))))
(operating-system
;; @dots{}
@@ -30431,7 +30435,7 @@ A service of this type is instantiated like this:
(service guix-service-type
(guix-configuration
(build-accounts 5)
- (use-substitutes? #f)))
+ (extra-options '("--gc-keep-derivations"))))
@end lisp
The second argument to the @code{service} form is a value representing
