From patchwork Fri May 2 16:58:01 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: 42254 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 3A44527BC4A; Fri, 2 May 2025 17:59:12 +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=-5.6 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 0357027BC49 for ; Fri, 2 May 2025 17:59:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAtj7-0002By-7J; Fri, 02 May 2025 12:59: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 1uAtj5-0002BT-3z for guix-patches@gnu.org; Fri, 02 May 2025 12:59: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 1uAtj4-0002tQ-Ra for guix-patches@gnu.org; Fri, 02 May 2025 12:59: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=1CDR2AtKa4fxImXnggzSEedKcw9e1xe6Zqd1srf7HWc=; b=NdxT3PtxU1e29YW4/vF+448s3DxkkCUEaim96Gq78Ujl+WBTBejRjrO8beUB+bb/LJzoFUqPQ/v6+EUV0JnVuu9DD6Bb29/Wema4PDv70f/IUfJvtSQOd47TxM1vMYSC08Fogwhd+Fx+7sm7s1J+1CIh/HBVCQquij8ES3hGuyOWOF453RRVNZ3s4LC7I0gmT26B7C4uvEQABU52CChjd3Uc+XbuIqGl09WT4ZYD9IHoUHyw4PiYoNTzRHTyWFQjc48psNdzWj9Mfdxim2YxEPD3toGqBUQasBhqWM6a0yyXVz6/gAmatzfl3wOCUAeRZufIPAa9BJMiDkcOYq5JOA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uAtj4-0006iH-KL for guix-patches@gnu.org; Fri, 02 May 2025 12:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71981] [PATCH v3] 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: Fri, 02 May 2025 16:59: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.174620509025715 (code B ref 71981); Fri, 02 May 2025 16:59:02 +0000 Received: (at 71981) by debbugs.gnu.org; 2 May 2025 16:58:10 +0000 Received: from localhost ([127.0.0.1]:32845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uAtiD-0006gh-NU for submit@debbugs.gnu.org; Fri, 02 May 2025 12:58:10 -0400 Received: from wolfsden.cz ([37.205.8.62]:42362) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1uAtiA-0006gT-IN for 71981@debbugs.gnu.org; Fri, 02 May 2025 12:58:07 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9DA0A39BF06; Fri, 2 May 2025 16:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1746205085; bh=rdWM2dlRpd6Wkn/CGl+MxI8iet5/UysTQDaQhMuJZrM=; h=From:To:Cc:Subject:Date; b=LqlmDTB0Ae71B3KBn6GQYLgiGV3KewVporPRZpyiq0bAbq3r77sGAKlMuiOAVYw/A Bk8jdruzeUbHYHFAXRmrvXTSBw7qP/FNQcnxE5FuFEFcWvkBOBMZqLx/cQwnB2dsaM 74Jf40XMzTUZKO5Jg/xAPsLPhclJREpur16nd2xYPpDX9f6KMQxUcld0fTzAsRA1fi ExMaF2jGPfJRFs9Q+mmnlJBvdSus/045gG+KTERPCQNy6SyHwO5+ghl6jrfZX3BaAJ A1J2oYUrfxtm1tMa0k642LwF+6vMpVIH1TqFuC3z8OSsIMUIdHOvaszAAkrJ3lmas+ x5TjwdSJXlJlJqGQABTPNyVZ6re8O8Q4tiojawgxnhH7mWhKIGp+MANa0HKxt+DGgR WGD/wYF0cwKYKj/LWK5vekxfvZFVYm0BRvUmlicbN7kVtVdIVeQsBPeCRqO1GuA4FD zHgWDd/DZHpoaYtdW9HYbY5vA+2C2M2XA1zhBlO/jUFF1pwBvj38aqJjT0epIcEtUp DBowd9gr58xZKQTXCwFlKa23hmU2C/rmeKGnTw1n8YNFI+lvKhaLPA8JNfL99siRUx aneXWd4cgoM+8RRY66cvwIP2dcC06BFjjGDPfPGwuh2zOKlyD3gbSOKz1a4DsyVO54 0PELOt1O2lPmglKuYepe6rPk= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 8C1CE39ACC7; Fri, 2 May 2025 16:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1746205084; bh=rdWM2dlRpd6Wkn/CGl+MxI8iet5/UysTQDaQhMuJZrM=; h=From:To:Cc:Subject:Date; b=GahueOh8JV/amL6mp/Z6xJG8k7hXDB303KlS8vwFtiKWZCPco6mnesoiLs7IjFx3P JRw2R3jcoJQ1gu5REofD8Rel30hou8yMxJo5x880Uo3shDzLfba/hoStLgH9qMVxli J/CMlez7Z5bKaYMgsFekeCQmhV1STZtO70nn+bJ1Yh9zf+mr0pd6eaLkMIPVj73GLJ JmzPlIBQ6o4dMfTsP0ff9Hq8j6irkvWvw1SJjtD+rctU+EBY/pYLuhNMv3BnQlqUEG StYceVn4ssc2Rnbw9j0/i2yhLfkqKeJLP7QN+Oan0pOefRNz9YsGBhvNkszkpLnAfU gJZYfoYLIL0mrmPRJcPC1IVTbooBjssvGQr1H920sg8W2PE+YNI3hMj41EBcMBIlBX NCIf61uqL7r7A6Qbg933MqelplVEry6QLHpySgjzPIOzWzcR0+QGdlnHLSSD9+wuL9 2TDNqdrlgCvfBC4YF4hvHE8pH+iff12yqip3mGG9wsWFOP7RIdbQlZ4vbYJpL+IAWb NP4dtYF2ol2KSQtCBtMghsPK2t1ojodIf6BCJ12L5GhUdygWisS1LCp1MgiON6WcSa ZL0thVihpj3v3lqjjdI8lvMNg6kdnOxd5G3BOvFHyxFmjyaXf6GL9G7dXcjwI582mN H0JRlEYIbYNaR6kjadf8eJEE= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 2 May 2025 18:58:01 +0200 Message-ID: X-Mailer: git-send-email 2.49.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 15eddd7665..4280f50d1f 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -446,7 +446,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))))