From patchwork Fri May 23 09:04:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 42881 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 05B9E27BC4A; Fri, 23 May 2025 10:05:30 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 C3C1B27BC49 for ; Fri, 23 May 2025 10:05:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uIOKw-0007jf-1W; Fri, 23 May 2025 05:05:06 -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 1uIOKt-0007iz-Gt for guix-patches@gnu.org; Fri, 23 May 2025 05:05:04 -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 1uIOKt-0000rW-7u for guix-patches@gnu.org; Fri, 23 May 2025 05:05:03 -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=8B07q27+a2yMB6svj1avgti2IiU89lrs9J415WqMbzU=; b=MDYgh+58IaFI1WCjNtCPXAQaraxbA8c60wYhlZ39C6vihZaXGmuwaEaD47GKMvzzWJZsSQjgmb2iXl+ZZ+VOL4VVqezVMW/BaCZYIJV4Iuxd4RjouyHuAYbgIpyU1AOPv6VIrUxipRt6rCODp8hZaGTiJxWX5miYhDnDL5IhVaGfufB5aVa7noQTK5ElGxwzlSNBzEphuQPRlPURfvmqSDN7QRBsoUMjqPT1TFhCEarqDw4XJ0wLiVcU0Cum6wbGyJKYZBEyScMqWyY/9bi24ICJKfhrnUY42Mi1M+QmEeSqyu3Rgos7kRtwrxQCG+lO6Sx1OZI3mwnCEx4MzzwFow==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uIOKs-0006iv-OR; Fri, 23 May 2025 05:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78546] [PATCH 1/3] services: configuration: Add define-enumerated-field-type helper. References: In-Reply-To: Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sarg@sarg.org.ru, guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 09:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78546 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78546@debbugs.gnu.org Cc: Sergey Trofimov , Sergey Trofimov X-Debbugs-Original-Xcc: Sergey Trofimov Received: via spool by 78546-submit@debbugs.gnu.org id=B78546.174799109425803 (code B ref 78546); Fri, 23 May 2025 09:05:02 +0000 Received: (at 78546) by debbugs.gnu.org; 23 May 2025 09:04:54 +0000 Received: from localhost ([127.0.0.1]:45522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIOKj-0006i1-Hg for submit@debbugs.gnu.org; Fri, 23 May 2025 05:04:54 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:42229) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uIOKg-0006hJ-1n for 78546@debbugs.gnu.org; Fri, 23 May 2025 05:04:51 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-ad1f6aa2f84so149267266b.0 for <78546@debbugs.gnu.org>; Fri, 23 May 2025 02:04:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1747991082; x=1748595882; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8B07q27+a2yMB6svj1avgti2IiU89lrs9J415WqMbzU=; b=Nfw4TP2U7nvfSN1NzMcJwZwbQlDIZkLyIgvRLrwwPSdt9966xw4zkcts4JfZKo0q2J 0GRnuoii9ySZlG3gUvUkqCPNR11QtYPDeDAB9ir+Fv6QfsW8CCsK+rPML5V9nMmiBYq1 nmJFMDJOknHjG6nZj0i+QRAy4xZGGw64O975fLkjBVOfDUv0QeNuQVa9KsJ52yro2XBp J+tFoTr7wQPT8C6GgSiWaCeAfG4Pb882lGQCc6NCGxlvc33TveJ4lwtZCA3GqVj1gu2M MFhVoQilyfme02nupGR+L7HAccNawXSJkf/eK5Aqhjnpv8THDpgRSk3gNrI2Moydj13j /u+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747991082; x=1748595882; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8B07q27+a2yMB6svj1avgti2IiU89lrs9J415WqMbzU=; b=UkDSllziAsg2VGa7cVNgf5S0tvr+vBsoWEWwUg7GyPiZMik1odogKuzEfpwOX7NHP9 Jjw59ny1lLiwbr3iJvyhFoIscIeAM5EjSOl8pZovmXess6dOPu6+ZGaq4AAuhRF9g9QI 6w4Xgnuw4bjXNXB7/7TnoOU9TW9cPognlg8j2QX1SWZoqP2BS2pXHfL1Dxd//8JMpm80 1W+MUOSPY2HhHBRAUPfJtb6rtC9RP7m+wbq6ELiMkt1wI2mlbNsYlGMooMV/zoV98igs WdEaJsIysXO/fbyklFqLvrgxQ4/ATp4jHPR2Hz557yNPmOSTMfBE1Zrx/OtFBIFYxQQy vweQ== X-Gm-Message-State: AOJu0YzR3eGhMRW4CshONBBH5ymjA7ekz5Fwj8rvDZbpHMxv+4IZEp/Y mNC00MWTtYY5sUVW2Q/KQjySi1KdYYt2DSmOEwR4S4+Z1/t3MuiZ5LG/jNrMtwTL1XW3xEb9HVh 5Jfqw03g= X-Gm-Gg: ASbGncvP07Lr2dNTZNro4Uns21ypRr9coAZIPX03Dn3967kUkRvp1/zIgQ1xaj9Od85 c6c4LMbYP1LmIEWD67ujH5wgyf0DE8H+i/siEhsWKPq+M1uc0hXXMAnjUJSKEyAfkPZWXZ0Hnoa qxHUvUJveczYzltqiG5Gx2pGTzW6sok3Zg/EodfttNBFklVaOP+dCAja8XDd6cPN+JcOp4to7r2 f6GxBWGiFtxQW6tmJ37PRdCLzQjxsGXi+732TM3S3eYKtlNS5IwH3D9bRfl+ch3uYo+88+rS/2W iD4b+CUp8434IThPIdUMbbPW3JZ3JZRUx3O3NZiANpaIp/DcJyFlHkq0nJ8I X-Google-Smtp-Source: AGHT+IG9B29A+w5HNoTLhiySUxJDoCOEsz1FN1aePufv3RsvTksjxlfEUDwZkWfSGQUC3FlVrXwMNA== X-Received: by 2002:a17:907:3e8b:b0:ad5:112:490b with SMTP id a640c23a62f3a-ad64e7b5146mr208875966b.9.1747991081919; Fri, 23 May 2025 02:04:41 -0700 (PDT) Received: from localhost ([2a02:2454:a095:5600:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d4cc5e9sm1205895866b.173.2025.05.23.02.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 May 2025 02:04:41 -0700 (PDT) From: Sergey Trofimov Date: Fri, 23 May 2025 11:04:32 +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 * gnu/services/cups.scm (define-enumerated-field-type): Move... * gnu/services/configuration.scm (define-enumerated-field-type): ...here. * gnu/services/vpn.scm (define-enumerated-field-type): Remove. * gnu/services/power.scm (define-enum): Replace with define-enumerated-field-type. Change-Id: I89ec40f479e3f800268e714f1f88d638be017c7e --- gnu/services/configuration.scm | 14 +++++++++++ gnu/services/cups.scm | 12 --------- gnu/services/power.scm | 45 +++++++++++----------------------- gnu/services/vpn.scm | 12 --------- 4 files changed, 28 insertions(+), 55 deletions(-) base-commit: 60025c2425dbac99df1219ed907c7c55e454b932 diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 15eddd7665..6d9fd1feae 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -75,6 +75,7 @@ (define-module (gnu services configuration) configuration->documentation empty-serializer serialize-package + define-enumerated-field-type filter-configuration-fields @@ -508,6 +509,19 @@ (define* (interpose ls #:optional (delimiter "\n") (grammar 'infix)) (cons delimiter acc)))) '() ls)) +(define-syntax define-enumerated-field-type + (lambda (x) + (syntax-case x (prefix) + ((_ name (option ...) (prefix serializer-prefix)) + #`(begin + (define (#,(id #'name #'name #'?) x) + (memq x '(option ...))) + (define (#,(id #'name #'serializer-prefix #'serialize- #'name) field-name val) + (#,(id #'name #'serializer-prefix #'serialize-field) field-name val)))) + + ((_ name (option ...)) + #`(define-enumerated-field-type name (option ...) (prefix #{}#)))))) + ;;; ;;; Commonly used predicates diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 738bb7f5cc..27aac7a16a 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -137,18 +137,6 @@ (define (non-negative-integer? val) (define (serialize-non-negative-integer field-name val) (serialize-field field-name val)) -(define-syntax define-enumerated-field-type - (lambda (x) - (define (id-append ctx . parts) - (datum->syntax ctx (apply symbol-append (map syntax->datum parts)))) - (syntax-case x () - ((_ name (option ...)) - #`(begin - (define (#,(id-append #'name #'name #'?) x) - (memq x '(option ...))) - (define (#,(id-append #'name #'serialize- #'name) field-name val) - (serialize-field field-name val))))))) - (define-enumerated-field-type access-log-level (config actions all)) (define-enumerated-field-type browse-local-protocols diff --git a/gnu/services/power.scm b/gnu/services/power.scm index ec8ae555d4..ad386549cd 100644 --- a/gnu/services/power.scm +++ b/gnu/services/power.scm @@ -204,23 +204,6 @@ (define-configuration/no-serialization apcupsd-event-handlers #~(#t)) "The handler for the battattach event.")) -(define-syntax define-enum - (lambda (x) - (syntax-case x () - ((_ name values) - (let* ((datum/name (syntax->datum #'name)) - (datum/predicate (string->symbol - (format #f "enum-~a?" datum/name))) - (datum/serialize (string->symbol - (format #f "serialize-enum-~a" datum/name)))) - (with-syntax - ((predicate (datum->syntax x datum/predicate)) - (serialize (datum->syntax x datum/serialize))) - #'(begin - (define (predicate value) - (memq value values)) - (define serialize serialize-symbol)))))))) - (define mangle-field-name (match-lambda ('name "UPSNAME") @@ -252,25 +235,25 @@ (define mangle-field-name ('data-time "DATATIME") ('facility "FACILITY"))) -(define (serialize-string field-name value) +(define (serialize-field field-name value) #~(format #f "~a ~a\n" #$(mangle-field-name field-name) '#$value)) -(define serialize-symbol serialize-string) -(define serialize-integer serialize-string) +(define serialize-string serialize-field) +(define serialize-symbol serialize-field) +(define serialize-integer serialize-field) (define (serialize-boolean field-name value) - #~(format #f "~a ~a\n" - #$(mangle-field-name field-name) - #$(if value "on" "off"))) + (serialize-field field-name (if value "on" "off"))) (define-maybe string) -(define-enum cable '( simple smart ether usb - 940-0119A 940-0127A 940-0128A 940-0020B 940-0020C - 940-0023A 940-0024B 940-0024C 940-1524C 940-0024G - 940-0095A 940-0095B 940-0095C 940-0625A MAM-04-02-2000)) -(define-enum type '(apcsmart usb net snmp netsnmp dumb pcnet modbus test)) -(define-enum no-logon '(disable timeout percent minutes always)) -(define-enum class '(standalone shareslave sharemaster)) -(define-enum mode '(disable share)) +(define-enumerated-field-type enum-cable + ( simple smart ether usb + 940-0119A 940-0127A 940-0128A 940-0020B 940-0020C + 940-0023A 940-0024B 940-0024C 940-1524C 940-0024G + 940-0095A 940-0095B 940-0095C 940-0625A MAM-04-02-2000)) +(define-enumerated-field-type enum-type (apcsmart usb net snmp netsnmp dumb pcnet modbus test)) +(define-enumerated-field-type enum-no-logon (disable timeout percent minutes always)) +(define-enumerated-field-type enum-class (standalone shareslave sharemaster)) +(define-enumerated-field-type enum-mode (disable share)) (define-configuration apcupsd-configuration (apcupsd (package apcupsd) "The @code{apcupsd} package to use.") diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index f97cbac7bb..56022ac27a 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -141,18 +141,6 @@ (define (ip-mask? val) #f))) (define serialize-ip-mask serialize-string) -(define-syntax define-enumerated-field-type - (lambda (x) - (define (id-append ctx . parts) - (datum->syntax ctx (apply symbol-append (map syntax->datum parts)))) - (syntax-case x () - ((_ name (option ...)) - #`(begin - (define (#,(id-append #'name #'name #'?) x) - (memq x '(option ...))) - (define (#,(id-append #'name #'serialize- #'name) field-name val) - (serialize-field field-name val))))))) - (define-enumerated-field-type proto (udp tcp udp6 tcp6)) (define-enumerated-field-type dev