From patchwork Sun Oct 5 17:07:24 2025 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: 43434 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 B3A2027BC4B; Sun, 5 Oct 2025 18:08:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_ADSP_ALL, DKIM_SIGNED,DKIM_VALID,DMARC_NONE,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=4.0.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 14F8827BC49 for ; Sun, 5 Oct 2025 18:08:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v5SDN-0004Yt-Gj; Sun, 05 Oct 2025 13:08:05 -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 1v5SDL-0004YQ-8Q for guix-patches@gnu.org; Sun, 05 Oct 2025 13:08:03 -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 1v5SDK-0001FX-S3 for guix-patches@gnu.org; Sun, 05 Oct 2025 13:08:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=C1Cop5KmhFbNPDq3HFltAwz4U3DeGy+1adK6NVQ4zPQ=; b=Wc+mLU5XLLNBKMeqX0J9VTfsFtZBHzfPjgUI00THJV/kDVi9qxpXBOoUKtHmorgwFZ8AAq4TUZfzpcZRJpYpehcrszZdaDXv/maAzp+e0pm0UKa1Vhrs9m7M/8QGUpjWN8fLNRXxhIv0ZJOqaH4gpyVMukWWS1yun+dlpvPKnB+PKp7IlHv2uzq7ZhxCdYCuQFT3Wff/3o1acsoagnSmgqw4OXK+xti+Lbkuoj0adyhPUtNiDwMUeVFYSfcpOtEmefe1Fym+FtHbtQ/8G0DKflw6MUr64d6v3bx9iBn5xr0W1jrI15Uj42hCNsP7Fepx3Dexpkl51gOABAONGYErpQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1v5SDK-0002XE-9e for guix-patches@gnu.org; Sun, 05 Oct 2025 13:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71981] [PATCH v4] services: configuration: Produce doc even if package->symbol fails. References: <53d2860103fbb103f902c3783724d44717be16d0.1720373267.git.~@wolfsden.cz> In-Reply-To: <53d2860103fbb103f902c3783724d44717be16d0.1720373267.git.~@wolfsden.cz> Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Oct 2025 17:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71981 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71981@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 71981-submit@debbugs.gnu.org id=B71981.17596840769731 (code B ref 71981); Sun, 05 Oct 2025 17:08:02 +0000 Received: (at 71981) by debbugs.gnu.org; 5 Oct 2025 17:07:56 +0000 Received: from localhost ([127.0.0.1]:52838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1v5SDD-0002Ws-Ct for submit@debbugs.gnu.org; Sun, 05 Oct 2025 13:07:55 -0400 Received: from wolfsden.cz ([37.205.8.62]:54084) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1v5SDA-0002Wi-78 for 71981@debbugs.gnu.org; Sun, 05 Oct 2025 13:07:53 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 2C55F32733D; Sun, 5 Oct 2025 17:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1759684070; bh=sJ+Yk3tsBcL3I0P3QzAUgtLQcidqNoBlNnfm0G1rKUI=; h=From:To:Cc:Subject:Date; b=pW5nq5qfRolNEJ7VFpKpMfQrwvojHk3G5jxfqrMD6wO1K25iE/PIuNwDO3i3K9ifN ahE3NnGHB95qTKWs+Cx5ICB8roRjAg0AJId5XGUE40TTpCgXNdLbP4SlmONshTEFLd /FK/+dCKABvWYMJ5wlp4jrZhAXz9UWUvNATU+YnkHCXsMd1DVykum708EACJ18b7IJ 0eKhMhAUnihjrBHoy6bwlOPQYnfvz+MGqaHRyJoLfJJ9QEap656W23CjYz9CzNTrgL 74Evuya0GCMy8DcK272/T/nFo8Co8IEoqZFh9SbczKvHuSeii5Ud7vCAVHJqH+fjut 368gIExL/jkuykQorICYiylYbeAhUCz5uq/R9/QOXz4wOfaHb+mRTqW6Ty0sO1Ntly gvnP/EYb6hRRzGajSajsu0iOhV/oVZjqsnDyLzsNMY0hD6bcOAbeUsUus7A8fj8QcZ hgpsa65i9mq/pbQk0ieyYoo3Ab3RhUEmv4wMmJxi2yWhcPuwgcSskFaAPysN8JvhOg HEOtQ9BiweIbK9LuN9uVx6TD97iHXRKBduVIT/Lb/bRnPaqSPIT3tMwixDBI9yKwyV drmWcKPD0x250lTQNi1EGoW3bd8SBVNvY5+9ak+ha8AyJWW5sECj7kNa/yY4rDo1dA 4pQew3LZsyWQhE1wt5+/jXJ0= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id EDC50325F79; Sun, 5 Oct 2025 17:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1759684068; bh=sJ+Yk3tsBcL3I0P3QzAUgtLQcidqNoBlNnfm0G1rKUI=; h=From:To:Cc:Subject:Date; b=bsKXaX+P0JeaEJ5K9Eeh95dTU9dRet4wGdV+SNOjFagwJMQ56z9j4WAU6/YKnxkcD l1ryWdfsh+urgGDJsam+ZjwkwTjtKiDV2bsXIcJX0UqnJ5eSZKzU8bNsRWq/gQbIHs rp3YGvtI0iFL2q+26nhP7v6e57GR+hTpZKa/jXir7MrnhmR6VRWjcTJJkc2mk+x4xx JTXXNR1AdFXqCzOXiIiVhRK5t3MQ7euIvz0XD51FJ/xGHhRGklEcVv3UiVIWukgaTu dFIr3gOHjh8LdUDKlWpOkE7FtUX5FQAc0bTddjc0EmVjgFBDzkFRfDHWRr16YecakN +V8bhe/YlqZBgtgHH7NcoxXaqo7WhXC5KklQYwAFgpxAX4nxtb9W+Njs5FslqAA5S5 93cq3G5BPK4nGzDcygND8Mdur5r3H0PnuzVSa9mnDuqk6/O8yq7nJeWI1RozGEwLZq LLCBofY1LBvXq2eBfI/9DFlyTilvQ4NTuCvjuRqKmmfWlEEkR+M10xkf+TOv4DQpcY Ejn7uJqS1q7gljdK2lhzYINKfyuLdb+u/FV/IDpjlDL/9/Em8TA8CMCUPLzNSiIIU7 6MVvOYQO58RTBD0JSc934JhRTmG7rsgTar3cnr+ZyXniK1ntvr98OKS2ZGsxabCZvI ePbdodgl9HV//Pm2HvC+4foo= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 5 Oct 2025 19:07:24 +0200 Message-ID: X-Mailer: git-send-email 2.51.0 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 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 0f803e2776..80da9bc72b 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -447,7 +447,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))))