tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00
Code Activity

services, tests: Refer to inherited field values where applicable.

Browse Source 
* 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
This commit is contained in:
Ludovic Courtès
2026-03-19 18:46:45 +01:00
parent 1ae20f03f4
commit 72e724cef4
7 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/machine/hetzner.scm
View File

@@ -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)

4
gnu/services/virtualization.scm
View File

@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ryan Moe <ryan.moe@gmail.com>
;;; Copyright © 2018, 2020-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018, 2020-2026 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020, 2021, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2022, 2025 Oleg Pykhalov <go.wigust@gmail.com>
@@ -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)

4
gnu/system/vm.scm
View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013-2026 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -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

4
gnu/tests.scm
View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016-2020, 2022-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016-2020, 2022-2026 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
@@ -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
=>

5
gnu/tests/avahi.scm
View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016-2020, 2022, 2024-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016-2020, 2022, 2024-2026 Ludovic Courtès <ludo@gnu.org>
;;;
;;; 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)

4
gnu/tests/base.scm
View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016-2020, 2022, 2024-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016-2020, 2022, 2024-2026 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
@@ -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)

6
gnu/tests/nfs.scm
View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016-2017, 2020-2021, 2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016-2017, 2020-2021, 2025-2026 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -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
=>