From patchwork Sun Jul 7 17:27:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 29031 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 1A9B327BBEA; Sun, 7 Jul 2024 18:29:07 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 76A1D27BBE2 for ; Sun, 7 Jul 2024 18:29:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQVh6-0000h2-Tx; Sun, 07 Jul 2024 13:29:01 -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 1sQVh4-0000gg-Hn for guix-patches@gnu.org; Sun, 07 Jul 2024 13:28:58 -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 1sQVh4-0006k8-9T for guix-patches@gnu.org; Sun, 07 Jul 2024 13:28:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQVh8-0005ev-JX for guix-patches@gnu.org; Sun, 07 Jul 2024 13:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71981] [PATCH] services: configuration: Produce doc even if package->symbol fails. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2024 17:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71981 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71981@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172037328621670 (code B ref -1); Sun, 07 Jul 2024 17:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jul 2024 17:28:06 +0000 Received: from localhost ([127.0.0.1]:49094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQVgE-0005dR-00 for submit@debbugs.gnu.org; Sun, 07 Jul 2024 13:28:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:39698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sQVgC-0005dH-Eg for submit@debbugs.gnu.org; Sun, 07 Jul 2024 13:28:04 -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 <~@wolfsden.cz>) id 1sQVg7-0000au-RM for guix-patches@gnu.org; Sun, 07 Jul 2024 13:27:59 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1sQVg5-0006Zs-P9 for guix-patches@gnu.org; Sun, 07 Jul 2024 13:27:59 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id C54BF8B7E; Sun, 7 Jul 2024 17:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1720373274; bh=juxeQ/ELR3w/qvaBdCykHMPOO9XhtuF6Dr4AFa3Xg+I=; h=From:To:Cc:Subject:Date; b=Ha/vuMfaeRezMKSAuljrfqrwu8TgEx7gVRCX2W2ro0cDLOLo0bjT7iDo5HjEUiXe9 XgE6w886DPpykTACD9NoSlaketSvG7F6F5NP2k61IaUciU8+uj1SZaVm1R8+sWR6FB G2JPQ76zhBLbTx+ZlvrErNSGZV33CTJn4YNWN5GF0UYSs0Keqk2Iq9EFuUqBVgrdii KYGR4nA+Bgiw4sPN9ooNUep4ww31BmYjr+AKxbqfJiYdXBP28iMe9C53Ga5FPs/iXc EAQnmXG/ZM4Pe+XYbDfPv67TB2GD9kdGfoRWs13tBF0oM6+r/nUaVjIBk3/gZUxiwn imzkH+26/G/zUwIRz5mR0+/swxCMZVeOAJ7ZkdNGLqdapwpVLps+O+LSzX4SfRR9eT srrxV/3jdwvjEjeihsbbZLjb9kpEpTNlZJY/OcFQTOe3kgMXJeCfNla79q9vjpu0Iu IQJN614KpJCUDrsh0pRKfR4TV1qcE0kL3Q0cjM+QqjNd2YfoxG0infUka7BXn9U6AP IGIVnKE4g9+SnyKhtt3hOhWvceRNFpvDTr8fT1D1jcxuUMjrYKMbycDHgVkCl+TcHe 8PC/FrJ95XeR2b/LbtTqhEUQkCkRTrxC2YXC80DBuHcQRdI+2FWqwLUwC/CuwpWWXX a1kZaOATcUGk+zxLGOaa8geg= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 0397E91EA; Sun, 7 Jul 2024 17:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1720373274; bh=juxeQ/ELR3w/qvaBdCykHMPOO9XhtuF6Dr4AFa3Xg+I=; h=From:To:Cc:Subject:Date; b=Ha/vuMfaeRezMKSAuljrfqrwu8TgEx7gVRCX2W2ro0cDLOLo0bjT7iDo5HjEUiXe9 XgE6w886DPpykTACD9NoSlaketSvG7F6F5NP2k61IaUciU8+uj1SZaVm1R8+sWR6FB G2JPQ76zhBLbTx+ZlvrErNSGZV33CTJn4YNWN5GF0UYSs0Keqk2Iq9EFuUqBVgrdii KYGR4nA+Bgiw4sPN9ooNUep4ww31BmYjr+AKxbqfJiYdXBP28iMe9C53Ga5FPs/iXc EAQnmXG/ZM4Pe+XYbDfPv67TB2GD9kdGfoRWs13tBF0oM6+r/nUaVjIBk3/gZUxiwn imzkH+26/G/zUwIRz5mR0+/swxCMZVeOAJ7ZkdNGLqdapwpVLps+O+LSzX4SfRR9eT srrxV/3jdwvjEjeihsbbZLjb9kpEpTNlZJY/OcFQTOe3kgMXJeCfNla79q9vjpu0Iu IQJN614KpJCUDrsh0pRKfR4TV1qcE0kL3Q0cjM+QqjNd2YfoxG0infUka7BXn9U6AP IGIVnKE4g9+SnyKhtt3hOhWvceRNFpvDTr8fT1D1jcxuUMjrYKMbycDHgVkCl+TcHe 8PC/FrJ95XeR2b/LbtTqhEUQkCkRTrxC2YXC80DBuHcQRdI+2FWqwLUwC/CuwpWWXX a1kZaOATcUGk+zxLGOaa8geg= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 7 Jul 2024 19:27:47 +0200 Message-ID: <53d2860103fbb103f902c3783724d44717be16d0.1720373267.git.~@wolfsden.cz> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Due to #71979 it can happen that package->symbol can return #f even for packages that are defined in modules on the load patch and which were previously loaded and set as a default value. In that case we can just return (package-name val), since for the purpose of illustrating the default value in the documentation the name should suffice. And having (possibly) slightly misleading documentation property is still better then `guix pull' just failing due to passing #f to symbol->string. * gnu/services/configuration.scm (generate-documentation)[package?]: Fall back to package-name if package->symbol fails. Change-Id: I9987caf40d3ff62a52cbd6e3325aa42c69a6c47a --- gnu/services/configuration.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index d2b1687496..a0e6fe206f 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -445,7 +445,14 @@ (define (generate-documentation documentation documentation-name) (define (show-default val) (cond ((package? val) - (symbol->string (package->symbol val))) + (let ((sym (package->symbol val))) + ;; Work around for #71979. While in the alternate + ;; the answer will not always match the symbol, it + ;; should be good enough for illustrating the default + ;; value in documentation. + (if sym + (symbol->string sym) + (package-name val)))) (((list-of package?) val) (format #f "(~{~a~^ ~})" (map package->symbol val))) (else (str val))))