From 72e724cef438a7e16052dd1a38bf03027635f2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 19 Mar 2026 18:46:45 +0100 Subject: [PATCH] services, tests: Refer to inherited field values where applicable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/machine/hetzner.scm (operating-system-authorize): Refer to ‘services’ instead of calling ‘operating-system-user-services’. * gnu/services/virtualization.scm (secret-service-operating-system): Likewise. * gnu/tests.scm (operating-system-with-console-syslog): Likewise. * gnu/tests/avahi.scm (%avahi-os): Likewise. * gnu/tests/base.scm (%test-guix-daemon-unprivileged): Likewise. * gnu/tests/nfs.scm (%nfs-os): Likewise. (run-nfs-full-test): Likewise. * gnu/system/vm.scm (virtualized-operating-system): Refer to ‘initrd-modules’ instead of calling ‘operating-system-initrd-modules’. Change-Id: I00c5f5c1e171b174bf0ca709b2dbd13a2fe161b5 --- gnu/machine/hetzner.scm | 2 +- gnu/services/virtualization.scm | 4 ++-- gnu/system/vm.scm | 4 ++-- gnu/tests.scm | 4 ++-- gnu/tests/avahi.scm | 5 ++--- gnu/tests/base.scm | 4 ++-- gnu/tests/nfs.scm | 6 +++--- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/machine/hetzner.scm b/gnu/machine/hetzner.scm index fdc22b4c05..c19f0ebc81 100644 --- a/gnu/machine/hetzner.scm +++ b/gnu/machine/hetzner.scm @@ -152,7 +152,7 @@ (operating-system (inherit os) (services - (modify-services (operating-system-user-services os) + (modify-services services (guix-service-type config => (guix-configuration (inherit config) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 3c9aadaae3..7d15abaf61 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ryan Moe -;;; Copyright © 2018, 2020-2025 Ludovic Courtès +;;; Copyright © 2018, 2020-2026 Ludovic Courtès ;;; Copyright © 2020, 2021, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2021 Timotej Lazar ;;; Copyright © 2022, 2025 Oleg Pykhalov @@ -1211,7 +1211,7 @@ that will be listening to receive secret keys on ADDRESS." ;; those keys are going to be overwritten by secrets received from the ;; host anyway. (cons (service secret-service-type address) - (modify-services (operating-system-user-services os) + (modify-services services (openssh-service-type config => (openssh-configuration (inherit config) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index a3db2991d6..626b5039ac 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2025 Ludovic Courtès +;;; Copyright © 2013-2026 Ludovic Courtès ;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe @@ -185,7 +185,7 @@ environment with the store shared with the host. MAPPINGS is a list of ;; XXX In 6.14, the kernel renamed the "cirrus" module to "cirrus-qemu", so ;; we account for that here. The renaming was done in this commit: ;; https://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git/commit/?id=5c3c99868aa2e0b68ac69f8050a6b9c994e73397 - (initrd-modules (let* ((modules (operating-system-initrd-modules os)) + (initrd-modules (let* ((modules initrd-modules) (kernel-version (package-version (operating-system-kernel os))) (cirrus-module diff --git a/gnu/tests.scm b/gnu/tests.scm index abb7076208..aa0875ba5c 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2020, 2022-2025 Ludovic Courtès +;;; Copyright © 2016-2020, 2022-2026 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2021 Maxime Devos @@ -274,7 +274,7 @@ the system under test." (operating-system (inherit os) (services - (modify-services (operating-system-user-services os) + (modify-services services (shepherd-system-log-service-type config => diff --git a/gnu/tests/avahi.scm b/gnu/tests/avahi.scm index d7f2fdaa72..21d8995a6d 100644 --- a/gnu/tests/avahi.scm +++ b/gnu/tests/avahi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2020, 2022, 2024-2025 Ludovic Courtès +;;; Copyright © 2016-2020, 2022, 2024-2026 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,8 +46,7 @@ (service dhcpcd-service-type) ;needed for multicast ;; Enable heavyweight debugging output. - (modify-services (operating-system-user-services - %simple-os) + (modify-services services (nscd-service-type config => (nscd-configuration (inherit config) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index b65e54222c..92bf4b4a11 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2020, 2022, 2024-2025 Ludovic Courtès +;;; Copyright © 2016-2020, 2022, 2024-2026 Ludovic Courtès ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2022, 2025 Maxim Cournoyer ;;; Copyright © 2022 Marius Bakke @@ -1348,7 +1348,7 @@ runs unprivileged.") (group "users")) %base-user-accounts)) (services - (modify-services (operating-system-user-services base) + (modify-services services (guix-service-type config => (guix-configuration (inherit config) diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 0453d45382..e760c4502a 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2017, 2020-2021, 2025 Ludovic Courtès +;;; Copyright © 2016-2017, 2020-2021, 2025-2026 Ludovic Courtès ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -170,7 +170,7 @@ %base-file-systems)) (services ;; Enable debugging output. - (modify-services (operating-system-user-services os) + (modify-services services (shepherd-system-log-service-type config => @@ -285,7 +285,7 @@ directories can be mounted.") (exports '(("/export" "*(rw,insecure,no_subtree_check,\ crossmnt,fsid=root,no_root_squash,insecure,async)"))))) - (modify-services (operating-system-user-services os) + (modify-services services (shepherd-system-log-service-type config =>