From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id AGeYCtwL0GQYAQEASxT56A (envelope-from ) for ; Sun, 06 Aug 2023 23:08:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id ELKSCtwL0GT/TgAAauVa8A (envelope-from ) for ; Sun, 06 Aug 2023 23:08:44 +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 D5E3A464AB for ; Sun, 6 Aug 2023 23:08:43 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=hG+oYRDw; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691356123; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=nDdToZxcfux/1RriOpjxjYDPb3Xi/MYRkq3pJUezDMc=; b=bNOqP40DtK2tj7Q5p+7scMGw4y/baRVJ0/q+p6x6mFkDHJfCirV9vUro8nha13pOzMb/9U m7UBKRGiRuql9M9lFP3S9zO6Ey1NRRL1ujhDrFQDbyEKCrY7OHnhPJbBUsSP8r+/9oG1dR k5rZ49r1bLSqD2mnuCqUCk+eWWUZ/njW1/UgEFOHweBRqLlB/6gckrZfXeSR4CCTYDJmU0 WbMvBJ7uJHn5w0nxQmhXTjrrDwc8RHaM8aItG27Y2aiJhNhLqmgvyoV0CEBPqOrZGaQ75n ecZcVnZo7xYxe/TZrzV9VgsYo0XyOH/y5oJVTiZPWg4zvBTRGqwe/Lef6H5Uww== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=hG+oYRDw; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691356123; a=rsa-sha256; cv=none; b=Y7JqyhxgJf8BWUTHe3qOSY1NP+dR0nTpvOH30dxikWABqCvZF4lWHhpLksboxXBjy19h1Y +dnYH9fINlCddNh8j/MkY06VFLOc/+q9cZL/nKIvP2mwyReQXvcmUn5+PyVWJzrCBvqhjW 9Vt579HcMokpndPO/z9yOReN6/yKId/ht799C7XkPC9yfLkuVhC2GPxjHNqjrM87SyFrh7 l4KTr0j4h9dVfxOXGrSLKBz1FbkzHEPpiEhzd5z4A72p3hOvDiT58d43elB7bfu3qisDkK yC7gIG7zsk9wybPqKtitD9longW9h8st22Qq5JjPTk+lKA5iw/O/hg5chjsK4w== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSkys-0006vY-4v; Sun, 06 Aug 2023 17:08: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 1qSkyq-0006ua-KL for guix-patches@gnu.org; Sun, 06 Aug 2023 17:08: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 1qSkyq-0001T0-CO for guix-patches@gnu.org; Sun, 06 Aug 2023 17:08:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSkyq-0005id-6V for guix-patches@gnu.org; Sun, 06 Aug 2023 17:08:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65119] [PATCH 3/8] services: syncthing: Use 'match-record'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Aug 2023 21:08:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65119 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65119@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 65119-submit@debbugs.gnu.org id=B65119.169135608121934 (code B ref 65119); Sun, 06 Aug 2023 21:08:04 +0000 Received: (at 65119) by debbugs.gnu.org; 6 Aug 2023 21:08:01 +0000 Received: from localhost ([127.0.0.1]:60123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSkyn-0005hc-3Q for submit@debbugs.gnu.org; Sun, 06 Aug 2023 17:08:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSkyk-0005gk-5C for 65119@debbugs.gnu.org; Sun, 06 Aug 2023 17:07:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qSkye-0001Lj-VZ; Sun, 06 Aug 2023 17:07:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=nDdToZxcfux/1RriOpjxjYDPb3Xi/MYRkq3pJUezDMc=; b=hG+oYRDwL/S23930QocJ UsPPusYrNftgepUPULAnBuWgYa4mdqlhjaaL2+7P7xHvkiO33Is2AB2JrIc82KZzBOz5ErMxRlZ1o 6Df1BQzlGJDJlxAU9UkmF1Wy7UPVMpF/oTIP3C0oPrhp4CSxbpob4E1vCM+swxUEeiZBkDb+/6iY/ v3YB43yWlpSmcRwHmg12tEnZqgQp8pL2A9Yo/ezhBtEZrZoSIWjYMBzascEKYW33l6qr3MLJQn/9Y l3ABSDbDOEs1E6EK8qeYSY3cTuJTdWsv9kUx49ky/se9joKd09eeYw7wZpFUp4dcolxis/TK5W5z7 FnD3jRKKHMr3Xg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 6 Aug 2023 23:07:30 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: D5E3A464AB X-Migadu-Scanner: mx1.migadu.com X-Spam-Score: -3.86 X-Migadu-Spam-Score: -3.86 X-TUID: AILmms2HHC4w * gnu/services/syncthing.scm (syncthing-shepherd-service): Use 'match-record-lambda' instead of 'match-lambda'. --- gnu/services/syncthing.scm | 52 +++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/gnu/services/syncthing.scm b/gnu/services/syncthing.scm index 7c3d5b027d..8f94aef088 100644 --- a/gnu/services/syncthing.scm +++ b/gnu/services/syncthing.scm @@ -51,32 +51,32 @@ (define-record-type* (default #f))) (define syncthing-shepherd-service - (match-lambda - (($ syncthing arguments logflags user group home) - (list - (shepherd-service - (provision (list (string->symbol (string-append "syncthing-" user)))) - (documentation "Run syncthing.") - (requirement '(loopback)) - (start #~(make-forkexec-constructor - (append (list (string-append #$syncthing "/bin/syncthing") - "-no-browser" - "-no-restart" - (string-append "-logflags=" (number->string #$logflags))) - '#$arguments) - #:user #$user - #:group #$group - #:environment-variables - (append (list (string-append "HOME=" (or #$home (passwd:dir (getpw #$user)))) - "SSL_CERT_DIR=/etc/ssl/certs" - "SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt") - (remove (lambda (str) - (or (string-prefix? "HOME=" str) - (string-prefix? "SSL_CERT_DIR=" str) - (string-prefix? "SSL_CERT_FILE=" str))) - (environ))))) - (respawn? #f) - (stop #~(make-kill-destructor))))))) + (match-record-lambda + (syncthing arguments logflags user group home) + (list + (shepherd-service + (provision (list (string->symbol (string-append "syncthing-" user)))) + (documentation "Run syncthing.") + (requirement '(loopback)) + (start #~(make-forkexec-constructor + (append (list (string-append #$syncthing "/bin/syncthing") + "-no-browser" + "-no-restart" + (string-append "-logflags=" (number->string #$logflags))) + '#$arguments) + #:user #$user + #:group #$group + #:environment-variables + (append (list (string-append "HOME=" (or #$home (passwd:dir (getpw #$user)))) + "SSL_CERT_DIR=/etc/ssl/certs" + "SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt") + (remove (lambda (str) + (or (string-prefix? "HOME=" str) + (string-prefix? "SSL_CERT_DIR=" str) + (string-prefix? "SSL_CERT_FILE=" str))) + (environ))))) + (respawn? #f) + (stop #~(make-kill-destructor)))))) (define syncthing-service-type (service-type (name 'syncthing) -- 2.41.0