From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 0DJmFJq8XGMNHQEAbAwnHQ (envelope-from ) for ; Sat, 29 Oct 2022 07:39:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 4O5iFJq8XGOfQgAA9RJhRA (envelope-from ) for ; Sat, 29 Oct 2022 07:39:38 +0200 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 2CD3094CE for ; Sat, 29 Oct 2022 07:34:38 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooeU9-0002ei-1I; Sat, 29 Oct 2022 01:34:21 -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 1oodIV-0008Di-8S for guix-patches@gnu.org; Sat, 29 Oct 2022 00:18:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oodII-0006rC-HE for guix-patches@gnu.org; Sat, 29 Oct 2022 00:18:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oodII-0005FG-CB for guix-patches@gnu.org; Sat, 29 Oct 2022 00:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58855] [PATCH 1/5] services: configuration: Re-order generated record fields. References: <20221029034716.11125-1-maxim.cournoyer@gmail.com> In-Reply-To: <20221029034716.11125-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Oct 2022 04:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58855@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 58855-submit@debbugs.gnu.org id=B58855.166701702720041 (code B ref 58855); Sat, 29 Oct 2022 04:18:02 +0000 Received: (at 58855) by debbugs.gnu.org; 29 Oct 2022 04:17:07 +0000 Received: from localhost ([127.0.0.1]:34734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oodHO-0005DA-Ow for submit@debbugs.gnu.org; Sat, 29 Oct 2022 00:17:07 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]:44879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oodHJ-0005CW-NN for 58855@debbugs.gnu.org; Sat, 29 Oct 2022 00:17:05 -0400 Received: by mail-qk1-f180.google.com with SMTP id l9so4706705qkk.11 for <58855@debbugs.gnu.org>; Fri, 28 Oct 2022 21:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2C9hOJj2tRvBloRpZ4NQJiF6+IdxNnN8DPs0tCRk2Pg=; b=OflZRA8zL/YB4PdFNvflSn07TRcKj1jU8FIE2aHJTpd1M6ojo1JkdEpLg02o5xMwqG agcjdAMtPELXp60jJhM7X0Mp+1DvoLHLqbWPnm2LDa8ySykwrcVrHMXj68VDl44RqHaL BMaPb2Fz3C+CUEfkxDJyOxREzPur4/9dCVLkO7vNAG16//1eZ07MvjDzgoypyGY3ejBr fmq6jX8ymOig1Ylf/flEpzAcpWiVBjXR55z51eaeFDMyqmgSCFYe+6G7CrF+jMqbqYJA Z30xTITgSOTdHAyZjZTgQ2xoa8IjTpOTm2bE8+AMNVMMyMoTdxYNVVfTGq1y36AW7WCL Adcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=2C9hOJj2tRvBloRpZ4NQJiF6+IdxNnN8DPs0tCRk2Pg=; b=oNS+OPqtUDSCMykWgbjE6KrQYehyjEqsJyr4FsNwBzI1zfflktuYbCwLj7t3L9qQyg oVQ5ooaeMyxaDhgn7yUEdI4Ql58SavvoQEgZWTqjDqgWtftboKkvWDh8kdcgmPlEl+Do CI1lI2jpUuFpRei5ETO0zVwzSQalhcBx0tfencLNi+UW8IG9PC6LU3Ln3QBdwBlIvDsy NvyEfH72MDu3GBtb9N/YTlMgOfs70Bk9VX0D5Wc0hwckRmSnKeMJ7sH/GkpUcK1LwDYg ITSxEyRdNZXANH2Unl68Gtg7WYvAVIPUuaz+4ElMIpCeWmEW1E/tA7WdWU9dB6CnXCU+ qN9A== X-Gm-Message-State: ACrzQf0I5JvDbc9IvYo1WlCVGtdZ2cXdENk68meg3geLU/KnLvDgcU7v eZAm027ee0lXNn3rlNqB/2nL+8vAacA= X-Google-Smtp-Source: AMsMyM60edVVmS8A+t/ke3X0IKQU4dvtSF7Nh0O3/aUZL2dIKIPheMsvPRCMqTgpTCh9nxnurCzt3Q== X-Received: by 2002:a05:620a:4606:b0:6ee:e73b:aecb with SMTP id br6-20020a05620a460600b006eee73baecbmr1774091qkb.681.1667017015902; Fri, 28 Oct 2022 21:16:55 -0700 (PDT) Received: from localhost.localdomain (dsl-152-179.b2b2c.ca. [66.158.152.179]) by smtp.gmail.com with ESMTPSA id do28-20020a05620a2b1c00b006f87d28ea3asm391514qkb.54.2022.10.28.21.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 21:16:55 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 29 Oct 2022 00:16:45 -0400 Message-Id: <20221029041649.12144-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org X-TUID: N1PHklq08d/0 This is so that the first field of the generated record matches the first one declared, which makes 'define-configuration' record API compatible with define-record-type* ones. * gnu/services/configuration.scm (define-configuration-helper): Move the %location field below the ones declared by the user. * gnu/services/monitoring.scm (zabbix-front-end-config): Adjust match pattern accordingly. --- gnu/services/configuration.scm | 10 +++++----- gnu/services/monitoring.scm | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 636c49ccba..dacfc52ba9 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -242,17 +242,17 @@ (define-record-type* #,(id #'stem #'< #'stem #'>) stem #,(id #'stem #'make- #'stem) #,(id #'stem #'stem #'?) - (%location #,(id #'stem #'stem #'-location) - (default (and=> (current-source-location) - source-properties->location)) - (innate)) #,@(map (lambda (name getter def) #`(#,name #,getter (default #,def) (sanitize #,(id #'stem #'validate- #'stem #'- name)))) #'(field ...) #'(field-getter ...) - #'(field-default ...))) + #'(field-default ...)) + (%location #,(id #'stem #'stem #'-location) + (default (and=> (current-source-location) + source-properties->location)) + (innate))) (define #,(id #'stem #'stem #'-fields) (list (configuration-field diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index 9c8704092c..b19c6c9f18 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -622,8 +622,8 @@ (define-configuration zabbix-front-end-configuration (define (zabbix-front-end-config config) (match-record config - (%location db-host db-port db-name db-user db-password db-secret-file - zabbix-host zabbix-port) + (db-host db-port db-name db-user db-password db-secret-file + zabbix-host zabbix-port %location) (mixed-text-file "zabbix.conf.php" "\