From patchwork Sat Feb 25 18:58:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47325 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 28D2516B70; Sat, 25 Feb 2023 19:01:07 +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 E777516AF4 for ; Sat, 25 Feb 2023 19:01:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVzlH-0001ur-QL; Sat, 25 Feb 2023 13:59:11 -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 1pVzlF-0001sI-9y for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:09 -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 1pVzlF-0000d1-0z for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzlE-0007y5-Sq for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61789] [PATCH 18/27] services: dbus: Deprecate 'polkit-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 18:59:08 +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.167735154730607 (code B ref 61789); Sat, 25 Feb 2023 18:59:08 +0000 Received: (at 61789) by debbugs.gnu.org; 25 Feb 2023 18:59:07 +0000 Received: from localhost ([127.0.0.1]:41480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzlC-0007xL-OO for submit@debbugs.gnu.org; Sat, 25 Feb 2023 13:59:07 -0500 Received: from smtpm2.myservices.hosting ([185.26.105.233]:59574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzke-0007t6-4c for 61789@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:36 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id A4BE520EFC for <61789@debbugs.gnu.org>; Sat, 25 Feb 2023 19:58:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 0A18380079; Sat, 25 Feb 2023 19:58:25 +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 4XjuZ4MzHTj4; 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 BB33A800A0; Sat, 25 Feb 2023 19:58:22 +0100 (CET) From: Bruno Victal Date: Sat, 25 Feb 2023 18:58:04 +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 'polkit-service' with 'polkit-service-type'. * gnu/services/dbus.scm (polkit-service): Deprecate procedure. * gnu/tests/docker.scm (%docker-os): Use polkit-service-type. * gnu/tests/virtualization.scm (%libvirt-os): Ditto. --- doc/guix.texi | 14 +++++++++----- gnu/services/dbus.scm | 6 ++++-- gnu/tests/docker.scm | 2 +- gnu/tests/virtualization.scm | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 1831528ef3..4ed77d6715 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23432,16 +23432,20 @@ Desktop Services set to @code{accountsservice} (the package object for AccountsService). @end defvar -@deffn {Scheme Procedure} polkit-service @ - [#:polkit @var{polkit}] -Return a service that runs the -@uref{https://www.freedesktop.org/wiki/Software/polkit/, Polkit privilege +@defvar polkit-service-type +Type for the service that runs the +@url{https://www.freedesktop.org/wiki/Software/polkit/, Polkit privilege management service}, which allows system administrators to grant access to privileged operations in a structured way. By querying the Polkit service, a privileged system component can know when it should grant additional capabilities to ordinary users. For example, an ordinary user can be granted the capability to suspend the system if the user is logged in locally. -@end deffn + +The value for this service is a @code{} object. +@end defvar + +@c TODO: Document , preferably by refactoring this to use +@c define-configuration and generating documentation from it. @defvar polkit-wheel-service Service that adds the @code{wheel} group as admins to the Polkit diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 5efd6bdadf..ea2593501f 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -28,6 +28,7 @@ (define-module (gnu services dbus) #:use-module ((gnu packages glib) #:select (dbus)) #:use-module (gnu packages polkit) #:use-module (gnu packages admin) + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module ((guix packages) #:select (package-name)) #:use-module (guix records) @@ -43,7 +44,7 @@ (define-module (gnu services dbus) polkit-configuration polkit-configuration? polkit-service-type - polkit-service)) + polkit-service)) ; deprecated ;;; ;;; D-Bus. @@ -404,7 +405,8 @@ (define polkit-service-type privileged operations in a structured way. Polkit is a requirement for most desktop environments, such as GNOME."))) -(define* (polkit-service #:key (polkit polkit)) +(define-deprecated (polkit-service #:key (polkit polkit)) + polkit-service-type "Return a service that runs the @uref{http://www.freedesktop.org/wiki/Software/polkit/, Polkit privilege management service}, which allows system administrators to grant access to diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 4267ff89a8..e464ec587e 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -49,7 +49,7 @@ (define %docker-os (simple-operating-system (service dhcp-client-service-type) (dbus-service) - (polkit-service) + (service polkit-service-type) (service elogind-service-type) (service docker-service-type))) diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index 60789fbb5b..6749ade4bd 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -50,7 +50,7 @@ (define %libvirt-os (simple-operating-system (service dhcp-client-service-type) (dbus-service) - (polkit-service) + (service polkit-service-type) (service libvirt-service-type))) (define (run-libvirt-test)