guix_mirror_bot pushed a commit to branch master
in repository guix.
commit e4995c9978017886f0ae85609edda90072cfc2d9
Author: Sergey Trofimov <[email protected]>
AuthorDate: Sat May 24 10:45:14 2025 +0200
services: network-manager: Require wireless-daemon.
* gnu/services/networking.scm
(<network-manager-configuration>)[shepherd-requirement]:
Replace wpa-supplicant with wireless-daemon.
* doc/guix.texi (Networking Setup): Adjust.
Change-Id: Id1a51429ccb6ea24839fc2aacd051a3ffe91c33c
Signed-off-by: Ludovic Courtès <[email protected]>
---
doc/guix.texi | 11 ++++++-----
gnu/services/networking.scm | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 405e11795f..cb73edbc01 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -22047,11 +22047,12 @@ Data type representing the configuration of
NetworkManager.
@item @code{network-manager} (default: @code{network-manager})
The NetworkManager package to use.
-@item @code{shepherd-requirement} (default: @code{'(wpa-supplicant)})
-This option can be used to provide a list of symbols naming Shepherd services
-that this service will depend on, such as @code{'wpa-supplicant} or
-@code{'iwd} if you require authenticated access for encrypted WiFi or Ethernet
-networks.
+@item @code{shepherd-requirement} (default: @code{'(wireless-daemon)})
+This option can be used to provide a list of symbols naming Shepherd
+services that this service will depend on. The default @code{'wireless-daemon}
+is provided by @code{'wpa-supplicant-service-type} and
@code{'iwd-service-type}.
+Make sure you have one of these configured. Note, that @code{%desktop-services}
+already include @code{wpa-supplicant-service-type}.
@item @code{dns} (default: @code{"default"})
Processing mode for DNS, which affects how NetworkManager uses the
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 4907dd5c04..4279c77b2d 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1419,7 +1419,7 @@ project's documentation} for more information."
(network-manager network-manager-configuration-network-manager
(default network-manager))
(shepherd-requirement network-manager-configuration-shepherd-requirement
- (default '(wpa-supplicant)))
+ (default '(wireless-daemon)))
(dns network-manager-configuration-dns
(default "default"))
(vpn-plugins network-manager-configuration-vpn-plugins ;list of file-like
