From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iKT0OOQB+GHHfQAAgWs5BA (envelope-from ) for ; Mon, 31 Jan 2022 16:36:04 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kIxrNuQB+GEwXwAA9RJhRA (envelope-from ) for ; Mon, 31 Jan 2022 16:36:04 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A08CB3D678 for ; Mon, 31 Jan 2022 16:36:04 +0100 (CET) Received: from localhost ([::1]:46702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEYip-0004QJ-Ip for larch@yhetil.org; Mon, 31 Jan 2022 10:36:03 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1643643364; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=GRwAtcQB5pFFzmOWItCPdJNgBWusdmyVGoyN00Sgcd0=; b=svorYx7R80LNxqkbST1CmK2GfaOKubOzpK8+LpjQkreAHenOoamOS2kNP0Dl8bpWVkNNtX Ibt1Hnb1y1ExyDWoWCPXJVZKDCaJeiJoEUPCvS+DE7NQabTMaMGOWvReCXN2auMxnjIty4 ohE8Zps/gT+uQnlkcOlnWjtN/mUmfTmPwOC0wQPDfZ8NLapS9SQ/y8A7OqpsQzFpTiyBOC ci2pkDU6j2Ox1//XNUzfD6vWNNNNnLZSvlS7xb5SMCPSubNp/ZlaBoQ+yYJRO1V4VuVFrh JP3XjE11gpmmWIXgYQFFfhC6ryefqlGO/asQONpMikXh88qnCnbyqFPAgDculw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643643364; a=rsa-sha256; cv=none; b=BN5sY6yXnYTsXy108RZtQMfyoIEVccrNg6ozAnW8KoYCmTQRQ5+QPrGPORSoSlkooSBWhO IW/ORtQXjkk5rTQSwfyb4500WtJ8iilrV0IK5PIA2Bfwfpx4G2yZpY7dApCpCXFWj2vqiH vH8xdbbXp6QSlo7Scln1ODsrN0U2ImlJD0Qqt/wtdmsKho6JV5Lu7HFAYdHdIS7s0FN5EY P1uKq5PqPTEkjIN/xOnto8MTYVotvFb8bMhbmWn36o1VxjDXldVsu4iVd7FB9GNuKS03VI KAhzil8soThmW+yJKtUX/j/eJO6JFAv2IdpzkU4HHXryls3W0qLOOWWF4hWBtA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=LaALMnKg; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.83 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=LaALMnKg; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A08CB3D678 X-Spam-Score: -0.83 X-Migadu-Scanner: scn1.migadu.com X-TUID: sp0D90u5m3YE 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) -- 2.34.0