From patchwork Tue Apr 8 14:07:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain GARBAGE X-Patchwork-Id: 41458 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 F19D627BC4B; Tue, 8 Apr 2025 15:09:47 +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=ham 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 4DABC27BC49 for ; Tue, 8 Apr 2025 15:09:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u29da-0003lz-9r; Tue, 08 Apr 2025 10:09:14 -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 1u29dW-0003jc-4W for guix-patches@gnu.org; Tue, 08 Apr 2025 10:09:10 -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 1u29dU-0005Xz-M6; Tue, 08 Apr 2025 10:09:08 -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:Subject; bh=t/lmI10+CE2Al7K0+mHRjZ7xo51bRrMOYjIKvd4YGkg=; b=mSbw64TijUuwsIpu1t+UrrnX1U+JUpG3s1Y0IOsHdNymAvRsKfvqW16lbh9BJt/wSpLchT3vBAJ8TWEZlOhvOak+mKmyHLHmFvRQcYQskcL09ZOpvFVed7KhFK5zfJPfXbhtjIFJ8y3YRVUgSpCxQviab2PBCcn7QwKLCwsH8VCKqATnvLoHXdiW5W3ykehE8V0Eq/+GZjAF1Nb4PBaTmseTjdCkUB0GYsf1twsPcSU+4BpGyrRuDNiFa2295AQVVwk3K16NX8x0ZHb0Iawu7eVzARF+eP5uIXMCUjP/U7F2cjFh8blmmU0BuMJmZmamtTWOx9w7YFICwkms7tpLKQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u29dP-0004ej-St; Tue, 08 Apr 2025 10:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77647] [PATCH] home: mail: Add G-expression support to msmtp configuration. Resent-From: Romain GARBAGE Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, janneke@gnu.org, ludo@gnu.org, tanguy@bioneland.org, guix-patches@gnu.org Resent-Date: Tue, 08 Apr 2025 14:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77647 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77647@debbugs.gnu.org Cc: ludovic.courtes@inria.fr, Romain GARBAGE , Andrew Tropin , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Tanguy Le Carrour Received: via spool by submit@debbugs.gnu.org id=B.174412133817860 (code B ref -1); Tue, 08 Apr 2025 14:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Apr 2025 14:08:58 +0000 Received: from localhost ([127.0.0.1]:34271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u29dI-0004ds-L8 for submit@debbugs.gnu.org; Tue, 08 Apr 2025 10:08:57 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46422) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u29d9-0004b8-S7 for submit@debbugs.gnu.org; Tue, 08 Apr 2025 10:08:51 -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 1u29cA-0003IK-OM for guix-patches@gnu.org; Tue, 08 Apr 2025 10:07:59 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u29c5-0005Sd-Hc for guix-patches@gnu.org; Tue, 08 Apr 2025 10:07:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=t/lmI10+CE2Al7K0+mHRjZ7xo51bRrMOYjIKvd4YGkg=; b=HpxQJWDW1Ahc4Iw3sWiMYTpT4q1jweDZPCa8VAcfJuz/Ge8AGWZdUdDS btOaGnSlYQHnZOgP8rNS3Iy65FVePegjU3GT2zqmo0wcCDPZDmEzoQBUK suJ4x+4isBjeoKp1ii+h2Xwi2U3wOtjMxM3NjMWOjksrkqrKWT0Vf4vsq Q=; Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=romain.garbage@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.15,198,1739833200"; d="scan'208";a="113762166" Received: from unknown (HELO guix-A102.bordeaux.inria.fr) ([193.50.110.96]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2025 16:07:32 +0200 From: Romain GARBAGE Date: Tue, 8 Apr 2025 16:07:00 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=192.134.164.104; envelope-from=romain.garbage@inria.fr; helo=mail3-relais-sop.national.inria.fr X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/home/services/mail.scm (string-or-gexp?): New variable. (maybe-string-or-gexp): New record type (msmtp-configuration-serialize-string-or-gexp): New variable. (msmtp-configuration) [password-eval]: Change type. Change-Id: Id3016956250c447b301b40f29a6509d57058be49 --- gnu/home/services/mail.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) base-commit: 61fe7d1749720d4e6f0feb00a8baa8ca1606e1a4 diff --git a/gnu/home/services/mail.scm b/gnu/home/services/mail.scm index 5445c82c67..78d614dc84 100644 --- a/gnu/home/services/mail.scm +++ b/gnu/home/services/mail.scm @@ -49,9 +49,14 @@ (define-module (gnu home services mail) msmtp-account-name msmtp-account-configuration)) +(define (string-or-gexp? obj) + (or (string? obj) + (gexp? obj))) + (define-maybe string (prefix msmtp-configuration-)) (define-maybe boolean (prefix msmtp-configuration-)) (define-maybe integer (prefix msmtp-configuration-)) +(define-maybe string-or-gexp (prefix msmtp-configuration-)) ;; Serialization of 'msmtp'. (define (uglify-symbol field-name) @@ -68,6 +73,9 @@ (define (msmtp-configuration-serialize-boolean field-name value) (define (msmtp-configuration-serialize-string field-name value) #~(string-append #$(uglify-symbol field-name) " " #$value "\n")) +(define msmtp-configuration-serialize-string-or-gexp + msmtp-configuration-serialize-string) + (define (msmtp-configuration-serialize-maybe-string-no-underscore field-name value) #~(if #$(maybe-value-set? value) (string-append @@ -148,7 +156,7 @@ (define-configuration msmtp-configuration "Set the envelope-from address.") (password-eval - maybe-string + maybe-string-or-gexp "Set the password for authentication to the output (stdout) of the command cmd." (serializer msmtp-configuration-serialize-maybe-string-no-underscore))