06/07: hydra: build-machines: Use non-deprecated forms for services.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 44674b7044af647b45ad2ab6f65c52e7d836c5c7
Author: Ludovic Courtès <address@hidden>
Date:   Thu Jul 11 14:39:53 2019 +0200

    hydra: build-machines: Use non-deprecated forms for services.
    
    * hydra/modules/sysadmin/build-machines.scm (build-machine-os): Use
    'file-system-label' instead of (title 'label).  Use the 'service' form
    instead of 'dhcp-client-service' and 'mcron-service'.
    (berlin-build-machine-os): Likewise.
---
 hydra/modules/sysadmin/build-machines.scm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/hydra/modules/sysadmin/build-machines.scm 
b/hydra/modules/sysadmin/build-machines.scm
index 44fd060..8d8d866 100644
--- a/hydra/modules/sysadmin/build-machines.scm
+++ b/hydra/modules/sysadmin/build-machines.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix system administration tools.
 ;;;
-;;; Copyright © 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This program is free software: you can redistribute it and/or modify
@@ -56,16 +56,15 @@ HOST-NAME and accessibly by SYSADMINS, with the given 
AUTHORIZED-GUIX-KEYS."
                  (bootloader grub-bootloader)
                  (target "/dev/sda")))
     (file-systems (cons (file-system
-                          (device "my-root")
-                          (title 'label)
+                          (device (file-system-label "my-root"))
                           (mount-point "/")
                           (type "ext4"))
                         %base-file-systems))
 
     (services (cons* (service sysadmin-service-type sysadmins)
                      (service openssh-service-type)
-                     (dhcp-client-service)
-                     (mcron-service (list gc-job))
+                     (service dhcp-client-service-type)
+                     (service mcron-service-type (list gc-job))
                      (modify-services %base-services
                        (guix-service-type config =>
                                           (guix-configuration
@@ -115,8 +114,7 @@ AUTHORIZED-GUIX-KEYS."
                  (terminal-inputs '(serial))
                  (terminal-outputs '(serial))))
     (file-systems (cons (file-system
-                          (device "my-root")
-                          (title 'label)
+                          (device (file-system-label "my-root"))
                           (mount-point "/")
                           (type "ext4"))
                         %base-file-systems))
@@ -147,7 +145,7 @@ AUTHORIZED-GUIX-KEYS."
                               (zabbix-agent-configuration
                                (server '("141.80.167.131"))
                                (server-active '("141.80.167.131"))))
-                     (mcron-service (list gc-job))
+                     (service mcron-service-type (list gc-job))
                      (service qemu-binfmt-service-type
                               (qemu-binfmt-configuration
                                (platforms (lookup-qemu-platforms "arm" 
"aarch64"))