aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-04-15 22:12:37 +0200
committerLudovic Courtès <ludo@gnu.org>2017-04-16 00:48:07 +0200
commitefe7d19a9edafb793dca21dcefce89ead3465030 (patch)
tree77edd6959caf8e02e5ed2e0369d9ab4e2ead1fa0 /gnu
parentaf3f64477cb1586a567268c4df85dbb3bf4362cf (diff)
downloadgnu-guix-efe7d19a9edafb793dca21dcefce89ead3465030.tar
gnu-guix-efe7d19a9edafb793dca21dcefce89ead3465030.tar.gz
services: 'service-parameters' becomes 'service-value'.
* gnu/services.scm (<service>)[parameters]: Rename to... [value]: ... this. Change calls to 'service-parameters' to 'service-value'. * gnu/system.scm, gnu/tests/base.scm, guix/scripts/system.scm, tests/services.scm: Likewise. * doc/guix.texi (Service Reference): Adjust accordingly.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services.scm21
-rw-r--r--gnu/system.scm8
-rw-r--r--gnu/tests/base.scm2
3 files changed, 18 insertions, 13 deletions
diff --git a/gnu/services.scm b/gnu/services.scm
index 9f6e323e18..af4cffe819 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -51,7 +51,8 @@
service
service?
service-kind
- service-parameters
+ service-value
+ service-parameters ;deprecated
simple-service
modify-services
@@ -142,10 +143,14 @@
;; Services of a given type.
(define-record-type <service>
- (service type parameters)
+ (service type value)
service?
(type service-kind)
- (parameters service-parameters))
+ (value service-value))
+
+(define service-parameters
+ ;; Deprecated alias.
+ service-value)
(define (simple-service name target value)
"Return a service that extends TARGET with VALUE. This works by creating a
@@ -161,7 +166,7 @@ singleton service type NAME, of which the returned service is an instance."
service)
((_ svc (kind param => exp ...) clauses ...)
(if (eq? (service-kind svc) kind)
- (let ((param (service-parameters svc)))
+ (let ((param (service-value svc)))
(service (service-kind svc)
(begin exp ...)))
(%modify-service svc clauses ...)))))
@@ -321,7 +326,7 @@ file."
(define* (activation-service->script service)
"Return as a monadic value the activation script for SERVICE, a service of
ACTIVATION-SCRIPT-TYPE."
- (activation-script (service-parameters service)))
+ (activation-script (service-value service)))
(define (activation-script gexps)
"Return the system's activation script, which evaluates GEXPS."
@@ -432,7 +437,7 @@ and FILE could be \"/usr/bin/env\"."
(define (etc-directory service)
"Return the directory for SERVICE, a service of type ETC-SERVICE-TYPE."
- (files->etc-directory (service-parameters service)))
+ (files->etc-directory (service-value service)))
(define (files->etc-directory files)
(file-union "etc" files))
@@ -605,7 +610,7 @@ TARGET-TYPE; return the root service adjusted accordingly."
(match (find (matching-extension target)
(service-type-extensions (service-kind service)))
(($ <service-extension> _ compute)
- (compute (service-parameters service))))))
+ (compute (service-value service))))))
(match (filter (lambda (service)
(eq? (service-kind service) target-type))
@@ -616,7 +621,7 @@ TARGET-TYPE; return the root service adjusted accordingly."
(extensions (map (apply-extension sink) dependents))
(extend (service-type-extend (service-kind sink)))
(compose (service-type-compose (service-kind sink)))
- (params (service-parameters sink)))
+ (params (service-value sink)))
;; We distinguish COMPOSE and EXTEND because PARAMS typically has a
;; different type than the elements of EXTENSIONS.
(if extend
diff --git a/gnu/system.scm b/gnu/system.scm
index 69cbc8a081..89c4150f99 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -615,7 +615,7 @@ hardware-related operations as necessary when booting a Linux container."
(let* ((services (operating-system-services os #:container? container?))
(boot (fold-services services #:target-type boot-service-type)))
;; BOOT is the script as a monadic value.
- (service-parameters boot)))
+ (service-value boot)))
(define (operating-system-user-accounts os)
"Return the list of user accounts of OS."
@@ -623,12 +623,12 @@ hardware-related operations as necessary when booting a Linux container."
(account (fold-services services
#:target-type account-service-type)))
(filter user-account?
- (service-parameters account))))
+ (service-value account))))
(define (operating-system-shepherd-service-names os)
"Return the list of Shepherd service names for OS."
(append-map shepherd-service-provision
- (service-parameters
+ (service-value
(fold-services (operating-system-services os)
#:target-type
shepherd-root-service-type))))
@@ -638,7 +638,7 @@ hardware-related operations as necessary when booting a Linux container."
(let* ((services (operating-system-services os #:container? container?))
(system (fold-services services)))
;; SYSTEM contains the derivation as a monadic value.
- (service-parameters system)))
+ (service-value system)))
(define* (operating-system-profile os #:key container?)
"Return a derivation that builds the system profile of OS."
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index bcb8299c73..6ce5ab3de1 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -56,7 +56,7 @@ passed a gexp denoting the marionette, and it must return gexp that is
inserted before the first test. This is used to introduce an extra
initialization step, such as entering a LUKS passphrase."
(define special-files
- (service-parameters
+ (service-value
(fold-services (operating-system-services os)
#:target-type special-files-service-type)))