From patchwork Sat Feb 25 18:58:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47306 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 0E79316B42; Sat, 25 Feb 2023 18:59:32 +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=unavailable 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 370D216AF4 for ; Sat, 25 Feb 2023 18:59:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVzlF-0001sH-8C; Sat, 25 Feb 2023 13:59:09 -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 1pVzlC-0001qn-Le for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:07 -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 1pVzlC-0000cP-D3 for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzlC-0007x8-7C for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61789] [PATCH 19/27] services: desktop: Deprecate 'udisks-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 18:59:06 +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.167735151530377 (code B ref 61789); Sat, 25 Feb 2023 18:59:06 +0000 Received: (at 61789) by debbugs.gnu.org; 25 Feb 2023 18:58:35 +0000 Received: from localhost ([127.0.0.1]:41451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzkg-0007ti-8i for submit@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:34 -0500 Received: from smtpm2.myservices.hosting ([185.26.105.233]:59560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzka-0007s1-3Y for 61789@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:28 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id CD15520EFB for <61789@debbugs.gnu.org>; Sat, 25 Feb 2023 19:58:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 38494800A4; Sat, 25 Feb 2023 19:58:24 +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 Qs6hyGogXaXt; 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 1C784800A3; Sat, 25 Feb 2023 19:58:23 +0100 (CET) From: Bruno Victal Date: Sat, 25 Feb 2023 18:58:05 +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 'udisks-service' with 'udisks-service-type'. Document . * gnu/packages/kde-multimedia.scm (k3b)[description]: Replace 'udisks-service' with 'udisks-service-type'. * gnu/services/desktop.scm (udisks-service-type): Set default value. (udisks-service): Deprecate procedure. (desktop-services-for-system): Use udisks-service-type. --- doc/guix.texi | 21 +++++++++++++++++---- gnu/packages/kde-multimedia.scm | 4 ++-- gnu/services/desktop.scm | 10 ++++++---- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4ed77d6715..2c9f55cd19 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23529,9 +23529,10 @@ Desktop Services @end table @end deftp -@deffn {Scheme Procedure} udisks-service [#:udisks @var{udisks}] -Return a service for @uref{https://udisks.freedesktop.org/docs/latest/, -UDisks}, a @dfn{disk management} daemon that provides user interfaces +@defvar udisks-service-type +Type for the service that runs +@uref{https://udisks.freedesktop.org/docs/latest/, UDisks}, +a @dfn{disk management} daemon that provides user interfaces with notifications and ways to mount/unmount disks. Programs that talk to UDisks include the @command{udisksctl} command, part of UDisks, and GNOME Disks. Note that Udisks relies on the @command{mount} command, so @@ -23539,7 +23540,19 @@ Desktop Services system profile. For example if you want to be able to mount NTFS file-systems in read and write fashion, you'll need to have @code{ntfs-3g} installed system-wide. -@end deffn + +The value for this service is a @code{} object. +@end defvar + +@deftp {Data Type} udisks-configuration +Data type representing the configuration for @code{udisks-service-type}. + +@table @asis +@item @code{udisks} (default: @code{udisks}) (type: file-like) +Package object for UDisks. + +@end table +@end deftp @defvar colord-service-type This is the type of the service that runs @command{colord}, a system diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index d635eca26d..e3de6db432 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -460,8 +460,8 @@ (define-public k3b from .WAV and .MP3 audio files, configuring external programs and configuring devices. -The @code{udisks-service} should be enabled for @command{k3b} to discover the -available CD drives.") +The @code{udisks-service-type} should be enabled for @command{k3b} to discover +the available CD drives.") (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 24d9d9f0c3..701c64a75d 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -95,7 +95,7 @@ (define-module (gnu services desktop) udisks-configuration udisks-configuration? - udisks-service + udisks-service ; deprecated udisks-service-type colord-service-type @@ -931,9 +931,11 @@ (define udisks-service-type (description "Run UDisks, a @dfn{disk management} daemon that provides user interfaces with notifications and ways to mount/unmount disks. Programs that talk to UDisks include the @command{udisksctl} command, -part of UDisks, and GNOME Disks.")))) +part of UDisks, and GNOME Disks.") + (default-value (udisks-configuration))))) -(define* (udisks-service #:key (udisks udisks)) +(define-deprecated (udisks-service #:key (udisks udisks)) + udisks-service-type "Return a service for @uref{http://udisks.freedesktop.org/docs/latest/, UDisks}, a @dfn{disk management} daemon that provides user interfaces with notifications and ways to mount/unmount disks. Programs that talk to UDisks @@ -1799,7 +1801,7 @@ (define* (desktop-services-for-system #:optional ;; The D-Bus clique. (service avahi-service-type) - (udisks-service) + (service udisks-service-type) (service upower-service-type) (service accountsservice-service-type) (service cups-pk-helper-service-type)