From patchwork Fri Jan 13 21:34:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46093 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 E58C627BBE9; Fri, 13 Jan 2023 21:39:31 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 1F96727BBED for ; Fri, 13 Jan 2023 21:39:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGRlR-00039I-Pk; Fri, 13 Jan 2023 16:39:05 -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 1pGRlP-00038z-7q for guix-patches@gnu.org; Fri, 13 Jan 2023 16:39:03 -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 1pGRlO-000747-Vq for guix-patches@gnu.org; Fri, 13 Jan 2023 16:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGRlO-0005T1-90 for guix-patches@gnu.org; Fri, 13 Jan 2023 16:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60582] [PATCH v3 1/2] services: configuration: Format a list of packages by their names. References: In-Reply-To: Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 21:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60582@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 60582-submit@debbugs.gnu.org id=B60582.167364588620934 (code B ref 60582); Fri, 13 Jan 2023 21:39:02 +0000 Received: (at 60582) by debbugs.gnu.org; 13 Jan 2023 21:38:06 +0000 Received: from localhost ([127.0.0.1]:52540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGRkU-0005Ra-JG for submit@debbugs.gnu.org; Fri, 13 Jan 2023 16:38:06 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:49428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGRkS-0005RQ-NH for 60582@debbugs.gnu.org; Fri, 13 Jan 2023 16:38:05 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 34790202DC for <60582@debbugs.gnu.org>; Fri, 13 Jan 2023 22:37:59 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id D458880096; Fri, 13 Jan 2023 22:37:59 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Y3y1t4UPlcDI; Fri, 13 Jan 2023 22:37:59 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 616A280093; Fri, 13 Jan 2023 22:37:59 +0100 (CET) From: Bruno Victal Date: Fri, 13 Jan 2023 21:34:57 +0000 Message-Id: <0e6cbfdffea195d739ef180031dc2d6726203e0f.1673645697.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 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/configuration.scm (generate-documentation): Format a list of packages by their names. --- Simplified condition. I can't reproduce the issue that was supposed to be resolved by that conditional. I'm guessing I used to have a different format string back then. gnu/services/configuration.scm | 3 +++ 1 file changed, 3 insertions(+) base-commit: 0f85081ed1d99be57d3544e0307e7fa9ca043be9 diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 6b0291dc00..4017cd0fa8 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -35,6 +35,7 @@ (define-module (gnu services configuration) #:autoload (texinfo serialize) (stexi->texi) #:use-module (ice-9 curried-definitions) #:use-module (ice-9 match) + #:use-module (ice-9 format) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) @@ -370,6 +371,8 @@ (define (generate-documentation documentation documentation-name) (cond ((package? val) (symbol->string (package->symbol val))) + (((list-of package?) val) + (format #f "(~{~a~^ ~})" (map package->symbol val))) (else (str val)))) `(entry (% (heading From patchwork Fri Jan 13 21:34:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 46092 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 8A9AE27BBEB; Fri, 13 Jan 2023 21:39:30 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 86DD227BBE9 for ; Fri, 13 Jan 2023 21:39:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGRlS-0003As-8i; Fri, 13 Jan 2023 16:39:06 -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 1pGRlP-000390-A7 for guix-patches@gnu.org; Fri, 13 Jan 2023 16:39:03 -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 1pGRlP-00074C-1n for guix-patches@gnu.org; Fri, 13 Jan 2023 16:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGRlO-0005T8-MA for guix-patches@gnu.org; Fri, 13 Jan 2023 16:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60582] [PATCH v3 2/2] services: lightdm: Sync documentation with source. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 21:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60582@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 60582-submit@debbugs.gnu.org id=B60582.167364588920949 (code B ref 60582); Fri, 13 Jan 2023 21:39:02 +0000 Received: (at 60582) by debbugs.gnu.org; 13 Jan 2023 21:38:09 +0000 Received: from localhost ([127.0.0.1]:52543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGRkW-0005Rp-Su for submit@debbugs.gnu.org; Fri, 13 Jan 2023 16:38:09 -0500 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:57362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGRkV-0005Rg-Bz for 60582@debbugs.gnu.org; Fri, 13 Jan 2023 16:38:07 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id C46022092E for <60582@debbugs.gnu.org>; Fri, 13 Jan 2023 22:38:06 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6F62C80096; Fri, 13 Jan 2023 22:38:06 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id XGaUV83hFe_A; Fri, 13 Jan 2023 22:38:06 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-118-236.dsl.telepac.pt [85.242.118.236]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id D9BC780093; Fri, 13 Jan 2023 22:38:05 +0100 (CET) From: Bruno Victal Date: Fri, 13 Jan 2023 21:34:58 +0000 Message-Id: <6a46a643dbd361fd188a67f3d5f59feeead08cfe.1673645697.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <0e6cbfdffea195d739ef180031dc2d6726203e0f.1673645697.git.mirai@makinata.eu> References: <0e6cbfdffea195d739ef180031dc2d6726203e0f.1673645697.git.mirai@makinata.eu> 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 Table entry @item nodes cannot span multiple lines. * gnu/services/lightdm.scm (lightdm-gtk-greeter-configuration): Fix cursor-theme-size description. * doc/guix.texi (lightdm-service-type): Sync with source. --- doc/guix.texi | 12 ++++-------- gnu/services/lightdm.scm | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 751d0957d8..9c369bd881 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21818,7 +21818,7 @@ X Window @end lisp Or to set a PasswordFile for the classic (unsecure) VncAuth -mecanism: +mechanism: @lisp (vnc-server-command (file-append tigervnc-server "/bin/Xvnc" @@ -21854,9 +21854,7 @@ X Window @item @code{lightdm-gtk-greeter} (default: @code{lightdm-gtk-greeter}) (type: file-like) The lightdm-gtk-greeter package to use. -@item @code{assets} @ -(default: @code{(adwaita-icon-theme gnome-themes-extrahicolor-icon-theme)}) @ -(type: list-of-file-likes) +@item @code{assets} (default: @code{(adwaita-icon-theme gnome-themes-extra hicolor-icon-theme)}) (type: list-of-file-likes) The list of packages complementing the greeter, such as package providing icon themes. @@ -21882,8 +21880,7 @@ X Window Enable accessibility support through the Assistive Technology Service Provider Interface (AT-SPI). -@item @code{a11y-states} @ -(default: @code{(contrast font keyboard reader)}) (type: list-of-a11y-states) +@item @code{a11y-states} (default: @code{(contrast font keyboard reader)}) (type: list-of-a11y-states) The accessibility features to enable, given as list of symbols. @item @code{reader} (type: maybe-file-like) @@ -21917,8 +21914,7 @@ X Window @item @code{autologin-user} (type: maybe-string) The username to automatically log in with by default. -@item @code{greeter-session} @ -(default: @code{lightdm-gtk-greeter}) (type: greeter-session) +@item @code{greeter-session} (default: @code{lightdm-gtk-greeter}) (type: greeter-session) The greeter session to use, specified as a symbol. Currently, only @code{lightdm-gtk-greeter} is supported. diff --git a/gnu/services/lightdm.scm b/gnu/services/lightdm.scm index 7e3864fec2..0b9094cda1 100644 --- a/gnu/services/lightdm.scm +++ b/gnu/services/lightdm.scm @@ -151,7 +151,7 @@ (define-configuration lightdm-gtk-greeter-configuration "The name of the cursor theme to use.") (cursor-theme-size (number 16) - "The size to use for the the cursor theme.") + "The size to use for the cursor theme.") (allow-debugging? maybe-boolean "Set to #t to enable debug log level.")