From patchwork Sat Feb 25 18:58:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47318 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 E75B816BA5; Sat, 25 Feb 2023 19:00:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 4F98016B42 for ; Sat, 25 Feb 2023 19:00:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVzlP-0001xp-Kd; Sat, 25 Feb 2023 13:59:19 -0500 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 1pVzlB-0001p7-QQ for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVzlB-0000cC-HK for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzlB-0007wq-E4 for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61789] [PATCH 17/27] services: desktop: Deprecate 'accountsservice-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 18:59:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61789 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61789@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61789-submit@debbugs.gnu.org id=B61789.167735151330358 (code B ref 61789); Sat, 25 Feb 2023 18:59:05 +0000 Received: (at 61789) by debbugs.gnu.org; 25 Feb 2023 18:58:33 +0000 Received: from localhost ([127.0.0.1]:41446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzkf-0007tN-93 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:33 -0500 Received: from smtpm7.myservices.hosting ([185.26.105.208]:59302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzkX-0007rb-3F for 61789@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:26 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm7.myservices.hosting (Postfix) with ESMTP id 70DB620D32 for <61789@debbugs.gnu.org>; Sat, 25 Feb 2023 19:58:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 7AC208009D; Sat, 25 Feb 2023 19:58:23 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 3-gXCSMj1o02; Sat, 25 Feb 2023 19:58:23 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6991F8009E; Sat, 25 Feb 2023 19:58:22 +0100 (CET) From: Bruno Victal Date: Sat, 25 Feb 2023 18:58:03 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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 * doc/guix.texi (Desktop Services): Replace 'accountsservice-service' with 'accountsservice-service-type'. * gnu/services/desktop.scm (accountsservice-service): Deprecate procedure. (desktop-services-for-system): Use accountsservice-service-type. * gnu/tests/lightdm.scm (minimal-desktop-services): Ditto. --- doc/guix.texi | 15 +++++++-------- gnu/services/desktop.scm | 8 +++++--- gnu/tests/lightdm.scm | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2d69f94aa0..1831528ef3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23420,18 +23420,17 @@ Desktop Services @end table @end deftp -@deffn {Scheme Procedure} accountsservice-service @ - [#:accountsservice @var{accountsservice}] -Return a service that runs AccountsService, a system service that can +@defvar accountsservice-service-type +Type for the service that runs AccountsService, a system service that can list available accounts, change their passwords, and so on. AccountsService integrates with PolicyKit to enable unprivileged users to acquire the capability to modify their system configuration. -@uref{https://www.freedesktop.org/wiki/Software/AccountsService/, the -accountsservice web site} for more information. +See @url{https://www.freedesktop.org/wiki/Software/AccountsService/, +AccountsService} for more information. -The @var{accountsservice} keyword argument is the @code{accountsservice} -package to expose as a service. -@end deffn +The value for this service is a file-like object, by default it is +set to @code{accountsservice} (the package object for AccountsService). +@end defvar @deffn {Scheme Procedure} polkit-service @ [#:polkit @var{polkit}] diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index cd3d8efa55..24d9d9f0c3 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -124,7 +124,7 @@ (define-module (gnu services desktop) fontconfig-file-system-service accountsservice-service-type - accountsservice-service + accountsservice-service ; deprecated cups-pk-helper-service-type sane-service-type @@ -1281,7 +1281,9 @@ (define accountsservice-service-type on. AccountsService integrates with PolicyKit to enable unprivileged users to acquire the capability to modify their system configuration."))) -(define* (accountsservice-service #:key (accountsservice accountsservice)) +(define-deprecated + (accountsservice-service #:key (accountsservice accountsservice)) + accountsservice-service-type "Return a service that runs AccountsService, a system service that can list available accounts, change their passwords, and so on. AccountsService integrates with PolicyKit to enable unprivileged users to @@ -1799,7 +1801,7 @@ (define* (desktop-services-for-system #:optional (service avahi-service-type) (udisks-service) (service upower-service-type) - (accountsservice-service) + (service accountsservice-service-type) (service cups-pk-helper-service-type) (service colord-service-type) (geoclue-service) diff --git a/gnu/tests/lightdm.scm b/gnu/tests/lightdm.scm index 25fa06a9f1..aa97a96939 100644 --- a/gnu/tests/lightdm.scm +++ b/gnu/tests/lightdm.scm @@ -46,7 +46,7 @@ (define-module (gnu tests lightdm) (define minimal-desktop-services (list polkit-wheel-service (service upower-service-type) - (accountsservice-service) + (service accountsservice-service-type) (service polkit-service-type) (service elogind-service-type) (dbus-service)