From patchwork Sat May 24 13:01:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42898 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D310E27BC4D; Sat, 24 May 2025 14:03:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 70AE427BC49 for ; Sat, 24 May 2025 14:03:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uIoWp-0005pc-1p; Sat, 24 May 2025 09:03:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uIoWm-0005oZ-IY for guix-patches@gnu.org; Sat, 24 May 2025 09:03:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uIoWl-0005Eu-MZ; Sat, 24 May 2025 09:03:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=mMFG6j+rZz6lJvX7uvOzNIWYz9EJ27TouhVujx5bIt0=; b=UpRFeI6mU5exwoMJUl4oui4moy5ZHNg2RvzErHPvE6AuEvi5EZ1fjotjGUNEIMZ/tHjXrhnpI1kXd4n2d1po+ZPIx/l1vBYOX/SqSM40yQNrhw465H0vg287qz2aeOUOt5QkBZR0XFO2f5C8OeR1dnuBDvAhChbcKiXuk39nhzHo3BZnTyNSV3lzAbq8b9Otpe2rM/H9SELRRLD0YlF13xtgDV17LFfjaEEqhtjkTimzcPStTmZMh/9P1+CXz8zqVRxWWx3G3+A/oL0hMhE53B1XP+xhGMrYEQ4ojpRHWMIf5l5FG1J73iyzcYZmzRy9k/3NX3QOkjdsM1H5jhlJ5w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uIoWk-0004qT-Sc; Sat, 24 May 2025 09:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78546] [PATCH v2 4/5] services: network-manager: Require wireless-daemon. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sarg@sarg.org.ru, ludo@gnu.org, gabriel@erlikon.ch, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 24 May 2025 13:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78546 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78546@debbugs.gnu.org Cc: Sergey Trofimov , Sergey Trofimov , Ludovic =?utf-8?q?Court=C3=A8s?= , Gabriel Wicki , Maxim Cournoyer X-Debbugs-Original-Xcc: Sergey Trofimov , Ludovic =?utf-8?q?Court=C3=A8s?= , Gabriel Wicki , Maxim Cournoyer Received: via spool by 78546-submit@debbugs.gnu.org id=B78546.174809172618432 (code B ref 78546); Sat, 24 May 2025 13:03:02 +0000 Received: (at 78546) by debbugs.gnu.org; 24 May 2025 13:02:06 +0000 Received: from localhost ([127.0.0.1]:58889 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIoVp-0004n8-Lh for submit@debbugs.gnu.org; Sat, 24 May 2025 09:02:06 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:61889) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uIoVk-0004lM-6o for 78546@debbugs.gnu.org; Sat, 24 May 2025 09:02:00 -0400 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-ad52dfe06ceso81063766b.3 for <78546@debbugs.gnu.org>; Sat, 24 May 2025 06:02:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1748091714; x=1748696514; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mMFG6j+rZz6lJvX7uvOzNIWYz9EJ27TouhVujx5bIt0=; b=cT5SKzC4d9RU78GmflQDfWQ0lLrTf3GU1hVDAQtYBtL6gH2Hpbn/aORTQvwQwEDZRK Pj6cHIqO1YbI8sv4TB2SzlXkNvg/p00UoewLSTG/mFW6NVhFGGbZQZVLkbrNGFN4yufH lOT1e3Uq/rnV0CGV76H0hSLAt3Ohl9XiMHge55dDN3wZmhc3f3MbjoWocKmJ9uBegAYR 3haer5ZRVZ6H0eT/BXomvgBzkVOkFIvCaIpE2qfM63at1f+ItdHq/HAS0Trd2Mkmzl9O 97fqsPMieLGixw+Gk+2DTgegvLFZaTxuxdrsg49Z95pRvQm+iP7VvU3MD82ioKVrHq5Z Z67w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748091714; x=1748696514; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mMFG6j+rZz6lJvX7uvOzNIWYz9EJ27TouhVujx5bIt0=; b=GquFQ2xK2iy+5Mhx0a1MbjJIPMMBioPBo9lud3GnObZioPibmXx94wnbzxoiKODat2 sr3kWgAEIdtFxEhcx1JmElrSMQL2kzKE8RhIJEbY8P2AWi8zWPlrMpzISwFZPJkuJlm8 WjMoHjW83GAzcZhh0Jkm1X5cZIIzy3cB2OBh0laQgAOwQuu/+xa6y/gWhknnsoUMaSD1 sj0Jsk1VMgybcVhgoxybTGCbNBlz5Ft8McN0d24h3Q1abO/6OOK4EHLPXEwUNjN9P0qv KREgDGFT/IHMoroRwUncEzYrpFipW0k03njhADtji9eMcz9fxIq97SBEZyHyNT6pdJIv J4Vw== X-Gm-Message-State: AOJu0YxBDaB0co8cCyS4CEyxFI7lNDn1/MVF7WyLeFfq1tePr2uBsEzo ssHg1lz9avWo0iV50T9e4G2x/ix1ACBSrZ1idvEHU0MC338JZJ37Siz2ONuTvZqJ/bgpX+4bK0+ 47vwcy0PF6Q== X-Gm-Gg: ASbGncsRKKWfjySYJyhZ2jZlTRFJgDNtgq/5DBB1q7XkQUdM2q6eJQZAzHqhtaMGRPR xYRJFFhNvHF22j1pN48bGHASv42UmqtEJl6fWYG62p0klGLSR/0n/kHgPxyexWoDl2weySFK+xE t/GjlF2vaYHBRfqHcK/iJhSr5FNygQF159iM99rJhcmmVUG4Z3i5gRetNVj6LTdTO0UPNeJsCwQ NPSoNLUQa+BOc5LG/s9JEVMSor4xP3wpDjd2xJeQZIP6PQXIsDTwlRcVodshK8AnJ4Z0lZVQGVM +aHbLzUtpPW7vEeHvNhVnSGIbtfM5N/RpedL4T0xO8LNn0Lm X-Google-Smtp-Source: AGHT+IE36sFlxrQf0q0kKBS54R2DXi0GDAPR0dZ6Xa135HhDuIpvONoS3E5cjAfkKuAXhO6TOQqJkw== X-Received: by 2002:a17:907:8dcb:b0:ad2:5499:7599 with SMTP id a640c23a62f3a-ad85b0d2777mr221450866b.18.1748091713644; Sat, 24 May 2025 06:01:53 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d4466e2sm1407423366b.93.2025.05.24.06.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 May 2025 06:01:53 -0700 (PDT) From: Sergey Trofimov Date: Sat, 24 May 2025 15:01:31 +0200 Message-ID: <70e373df86451559144b1399fb392ee39066048e.1748091536.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.49.0 In-Reply-To: <99f9547c43312c49e557b5e67a356a76cc6b2ad7.1748091536.git.sarg@sarg.org.ru> References: <99f9547c43312c49e557b5e67a356a76cc6b2ad7.1748091536.git.sarg@sarg.org.ru> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm ()[shepherd-requirement]: Replace wpa-supplicant with wireless-daemon. * doc/guix.texi (Networking Setup): Adjust. Change-Id: Id1a51429ccb6ea24839fc2aacd051a3ffe91c33c --- 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 a3956172bc..a9c815c35c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22047,11 +22047,12 @@ Networking Setup @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 582c0edd32..900790ef2d 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1417,7 +1417,7 @@ (define-record-type* (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