From patchwork Mon Jan 31 15:27:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 36911 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 A74BF27BBEA; Mon, 31 Jan 2022 15:36:03 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 70A7827BBE9 for ; Mon, 31 Jan 2022 15:36:03 +0000 (GMT) Received: from localhost ([::1]:46702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEYio-0004QJ-Hj for patchwork@mira.cbaines.net; Mon, 31 Jan 2022 10:36:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEYhx-0004Jg-Bn for guix-patches@gnu.org; Mon, 31 Jan 2022 10:35:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEYhq-0007oW-47 for guix-patches@gnu.org; Mon, 31 Jan 2022 10:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEYhq-0000nO-0P for guix-patches@gnu.org; Mon, 31 Jan 2022 10:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53663] [PATCH] gnu: services: Also accept 'undefined in maybe-foo? constructs. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Jan 2022 15:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53663 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53663@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16436432883033 (code B ref -1); Mon, 31 Jan 2022 15:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jan 2022 15:34:48 +0000 Received: from localhost ([127.0.0.1]:40290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEYhc-0000mr-8u for submit@debbugs.gnu.org; Mon, 31 Jan 2022 10:34:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:48278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEYha-0000mj-63 for submit@debbugs.gnu.org; Mon, 31 Jan 2022 10:34:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEYhZ-0003zI-SK for guix-patches@gnu.org; Mon, 31 Jan 2022 10:34:45 -0500 Received: from [2a00:1450:4864:20::429] (port=38898 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEYhY-0007m8-56 for guix-patches@gnu.org; Mon, 31 Jan 2022 10:34:45 -0500 Received: by mail-wr1-x429.google.com with SMTP id c23so26176875wrb.5 for ; Mon, 31 Jan 2022 07:34:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GRwAtcQB5pFFzmOWItCPdJNgBWusdmyVGoyN00Sgcd0=; b=LaALMnKgyjdVcda6k1u6FDjL4uWorEdxc1J0unwLmIxPlXEjIde83ZgGHB+Mj8I385 19mS/knSAIjU2lrxp90Nc5XLtK7vUjzW50Vw22X3TSy45cCvgdKPpI/3GkeRtu7PJf1c 7Ueh0JytnxjjclRIYRwTjLqd+59gntlgWrkaUV3yq6IBhsOr3j88onAfCYTmtMlFmaSz 6721mFztanTLky8f9QbyOwEiwdDpDp1EfCB8v8gbmPdfxWtBCH9gxsWAG7eQuD0SCn44 8EhedHQEaUo/NUrmE7VsAj0615y8xfh39VLLJBFndgls0toElgE/uNUkuOKx4dM6M99K ClXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=GRwAtcQB5pFFzmOWItCPdJNgBWusdmyVGoyN00Sgcd0=; b=hKiXo/lz+2GzuSv95Nci3Z7PxhcWzbH1l9foM77f1dIZw7QZv4BL8iNRK7tHxG57gq j5hFsQgiBdroSme4G4kDhG00AjaGGa5qEtRVqpjeTX96NOPFusVO/RsFD19ZETSpNi9D xrGjFWgs0WFE6KcaHPMAi4PHSpLvlCT3TPHT+yRGd3V2KdAaf7jOq2iu1RU61pPoZ3pn CyjYdd8khrMsQex1wqPRGhw5+xEL36mnF+znoGEu3IQqFgnmawUKOmMLe6fTK6gmtuJ8 cWaH9OMTcnteY7RfTu9p3S2aaYgsj3FqluSw416DvB0m6D39H2GNE0dquvi0SUovXvw6 T0Ig== X-Gm-Message-State: AOAM5338Fw63eINwDjPv0yuNjF+hvrw74qer3+H50Fsj35VUa1HhHnqU RBZsfGIEb6eY+c5iDo1cIYr43MTDHlg= X-Google-Smtp-Source: ABdhPJzk04LdSYoLwkBxfQOlkMYOglPMqt3Q3fJH3HRmRczia9bcK9N+gZm+MUor1uDwsDzBQIlvww== X-Received: by 2002:a17:907:7e9f:: with SMTP id qb31mr17466522ejc.468.1643642905571; Mon, 31 Jan 2022 07:28:25 -0800 (PST) Received: from lelap.local (catv-89-132-245-188.catv.fixed.vodafone.hu. [89.132.245.188]) by smtp.gmail.com with ESMTPSA id a26sm13688815ejy.105.2022.01.31.07.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 07:28:24 -0800 (PST) From: Attila Lendvai Date: Mon, 31 Jan 2022 16:27:54 +0100 Message-Id: <20220131152753.19880-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=attila.lendvai@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" X-getmail-retrieved-from-mailbox: Patches This is a temporary bandaid until a more explicit handling of maybe types is introduced for configurations (e.g. by using srfi-189). Until then, with this change it becomes possible to have definitions like: (define-maybe string (no-serialization)) (define-configuration my-configuration (my-field (maybe-string)) (no-serialization)) i.e. without providing a default value for MY-FIELD. --- gnu/services/configuration.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 0de350a4df..c5f276eab5 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -141,7 +141,9 @@ (define (define-maybe-helper serialize? prefix syn) (id #'stem #'serialize-maybe- #'stem)))) #`(begin (define (maybe-stem? val) - (or (eq? val 'disabled) (stem? val))) + (or (eq? val 'disabled) + (eq? val 'undefined) + (stem? val))) #,@(if serialize? (list #'(define (serialize-maybe-stem field-name val) (if (stem? val)