From patchwork Mon Sep 13 06:48:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 32811 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 74E7627BBE3; Mon, 13 Sep 2021 07:49:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C1D2327BBE1 for ; Mon, 13 Sep 2021 07:49:23 +0100 (BST) Received: from localhost ([::1]:39056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPfmM-00005r-SJ for patchwork@mira.cbaines.net; Mon, 13 Sep 2021 02:49:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPfm2-0008Ud-SU for guix-patches@gnu.org; Mon, 13 Sep 2021 02:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60667) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPfm2-0003am-GU for guix-patches@gnu.org; Mon, 13 Sep 2021 02:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mPfm2-0007Pg-Fd for guix-patches@gnu.org; Mon, 13 Sep 2021 02:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50504] [PATCH] fixup! home-services: Add Mcron. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Sep 2021 06:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50504 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Oleg Pykhalov , 50504@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Xinglu Chen Received: via spool by 50504-submit@debbugs.gnu.org id=B50504.163151570528397 (code B ref 50504); Mon, 13 Sep 2021 06:49:02 +0000 Received: (at 50504) by debbugs.gnu.org; 13 Sep 2021 06:48:25 +0000 Received: from localhost ([127.0.0.1]:43964 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPflQ-0007Nw-Hn for submit@debbugs.gnu.org; Mon, 13 Sep 2021 02:48:25 -0400 Received: from mail-lj1-f175.google.com ([209.85.208.175]:43551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPflN-0007Nh-3b for 50504@debbugs.gnu.org; Mon, 13 Sep 2021 02:48:23 -0400 Received: by mail-lj1-f175.google.com with SMTP id j12so15347460ljg.10 for <50504@debbugs.gnu.org>; Sun, 12 Sep 2021 23:48:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=R0zFvuxZpICbnKqfXCeSlXGLTy1ZlXoZeQcrsIsP5pg=; b=SDbCpG4L90+n9V0yN/XjLxCNEAmtLjON6GT8aG9Y823wMbThdVtyU1DnKwV7GkYnHc Or8hH623DAb78EflS7e4EVcO1xxdCXqC7SYaHuR9cz36kc9qLlMEGoVM6IcY61cbsZ3r 5guM41SDVDt/MrCW6NZozEBwt5ltOmIx/S33dgMHkGzDKEqezr5WZ9u0tVgnHRaAuT5x TS/grEEHnJ+lxTtHHbEGGAxC9QYyv2VHPMY9Zn7VxhPAKckKBDynBxdtpheSW0LnHR7h VzRs88R1ukIKZM0J3P3aWTYYcb66srlhOeBTSjfUjhLxlpVKG2Qm2J9DM2UK8kyg/Qa0 kCuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=R0zFvuxZpICbnKqfXCeSlXGLTy1ZlXoZeQcrsIsP5pg=; b=PHl0AmWwYzP9O6BvaV53vLHArmSFldAqbBreNDlCH3N0I/SA0UBhpSzMgS5f1xb10T c8IssUKP49wHty+xWKIcM2Hx6EODIO1e+8mqVCOcXniPqjBgTExQA9fbqb71tEPf6Mt9 tLzvpHITOe7bmrZHF1v83Q3LtsQg6rdCEBrqiuN2aWGVh1jUOONhrllLHptvldyq5nGE pnbctTHyJhgJahlbAiMKGMIoS1S8YZj8YA9OIVmxA6Y1+1jheeWvThmVGdd1cQVBSqGK QhCq2HMrg45HzmLpLQ1c8Fp27l+wbx0ncQBLTi9Ufr+zjiVDwj3+DJ4+sHxwXvyXX+x9 yunQ== X-Gm-Message-State: AOAM530Al/0gUxPdVUw6a5w6GQpZXgWjBBkjxh44O57wJCmkKg6V7tDG ht8pft36bK6LzGkAGl3ruUE8Ig== X-Google-Smtp-Source: ABdhPJySwNXgVlZdClVUjsXoqWiq9wDenGUiwepu6pJaPYaDLGrIEamydgOoEuReAgfRuoumJemBgA== X-Received: by 2002:a2e:9e4c:: with SMTP id g12mr8892391ljk.433.1631515694994; Sun, 12 Sep 2021 23:48:14 -0700 (PDT) Received: from localhost (109-252-93-92.nat.spd-mgts.ru. [109.252.93.92]) by smtp.gmail.com with ESMTPSA id j12sm864984ljc.121.2021.09.12.23.48.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 23:48:14 -0700 (PDT) From: Andrew Tropin In-Reply-To: <87a6kkxpcp.fsf@yoctocell.xyz> References: <8735qc66mt.fsf@trop.in> <87a6kkxpcp.fsf@yoctocell.xyz> Date: Mon, 13 Sep 2021 09:48:11 +0300 Message-ID: <877dflrmxg.fsf@trop.in> 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" X-getmail-retrieved-from-mailbox: Patches Applied suggestions. On 2021-09-10 20:22, Xinglu Chen wrote: >> doc/guix.texi | 31 +++++++++- >> gnu/home-services/mcron.scm | 115 ++++++++++++++++++++++++++++++++++++ >> gnu/local.mk | 1 + >> 3 files changed, 146 insertions(+), 1 deletion(-) >> create mode 100644 gnu/home-services/mcron.scm >> >> diff --git a/doc/guix.texi b/doc/guix.texi >> index e546fcc0d2..a7eacad762 100644 >> --- a/doc/guix.texi >> +++ b/doc/guix.texi >> @@ -35685,7 +35685,36 @@ for example). >> @cindex mcron >> @cindex scheduling jobs >> >> -mcron info here >> +The @code{(gnu home-services mcron)} module provides an interface to >> +GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, >> +mcron, GNU@tie{}mcron}). The information about system's mcron is >> +applicable here (@pxref{Scheduled Job Execution}), the only difference >> +for home services is that they have to be declared in >> +@code{home-envirnoment} record instead of @code{operating-system}. > > “declared in a @code{home-environemnt} record instead of a > @code{operating-system} record.” > >> +@defvr {Scheme Variable} home-mcron-service-type >> +This is the type of the @code{mcron} home service, whose value is an > > Why @code{mcron}? I would use “Mcron” instead. > >> +@code{home-mcron-configuration} object. It allows to manage tasks > > “It allows one to manage scheduled tasks.” > >> +This service type can be the target of a service extension that provides >> +it additional job specifications (@pxref{Service Composition}). In > > s/it// > >> +other words, it is possible to define services that provide additional >> +mcron jobs to run. >> +@end defvr >> + >> +@deftp {Data Type} home-mcron-configuration >> +Data type representing the configuration of mcron. >> + >> +@table @asis >> +@item @code{mcron} (default: @var{mcron}) >> +The mcron package to use. >> + >> +@item @code{jobs} >> +This is a list of gexps (@pxref{G-Expressions}), where each gexp >> +corresponds to an mcron job specification (@pxref{Syntax, mcron job >> +specifications,, mcron, GNU@tie{}mcron}). >> +@end table >> +@end deftp >> >> @node Shepherd Home Service >> @subsection Managing User's Daemons >> diff --git a/gnu/home-services/mcron.scm b/gnu/home-services/mcron.scm >> new file mode 100644 >> index 0000000000..fdfde179a5 >> --- /dev/null >> +++ b/gnu/home-services/mcron.scm >> @@ -0,0 +1,115 @@ >> +;;; GNU Guix --- Functional package management for GNU >> +;;; Copyright © 2021 Andrew Tropin >> +;;; Copyright © 2021 Xinglu Chen >> +;;; >> +;;; This file is part of GNU Guix. >> +;;; >> +;;; GNU Guix is free software; you can redistribute it and/or modify it >> +;;; under the terms of the GNU General Public License as published by >> +;;; the Free Software Foundation; either version 3 of the License, or (at >> +;;; your option) any later version. >> +;;; >> +;;; GNU Guix is distributed in the hope that it will be useful, but >> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of >> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> +;;; GNU General Public License for more details. >> +;;; >> +;;; You should have received a copy of the GNU General Public License >> +;;; along with GNU Guix. If not, see . >> + >> +(define-module (gnu home-services mcron) >> + #:use-module (gnu packages guile-xyz) >> + #:use-module (gnu home-services) >> + #:use-module (gnu home-services shepherd) >> + #:use-module (gnu services shepherd) >> + #:use-module (guix records) >> + #:use-module (guix gexp) >> + #:use-module (srfi srfi-1) >> + #:use-module (ice-9 match) >> + >> + #:export (home-mcron-configuration >> + home-mcron-service-type)) >> + >> +;;; Commentary: >> +;; >> +;; Service for the GNU mcron cron job manager. >> +;; >> +;; Example configuration, the first job runs mbsync once every ten >> +;; minutes, the second one writes "Mcron service" to ~/mcron-file once >> +;; every minute. >> +;; >> +;; (service home-mcron-service-type >> +;; (home-mcron-configuration >> +;; (jobs (list #~(job '(next-minute >> +;; (range 0 60 10)) >> +;; (lambda () >> +;; (system* "mbsync" "--all"))) >> +;; #~(job next-minute-from >> +;; (lambda () >> +;; (call-with-output-file (string-append (getenv "HOME") >> +;; "/mcron-file") >> +;; (lambda (port) >> +;; (display "Mcron service" port))))))))) >> +;; >> +;;; Code: >> + >> +(define-record-type* home-mcron-configuration >> + make-home-mcron-configuration >> + home-mcron-configuration? >> + (package home-mcron-configuration-package ; package >> + (default mcron)) >> + (jobs home-mcron-configuration-jobs ; list of jobs >> + (default '()))) >> + >> +(define job-files (@@ (gnu services mcron) job-files)) >> +(define shepherd-schedule-action >> + (@@ (gnu services mcron) shepherd-schedule-action)) >> + >> +(define home-mcron-shepherd-services >> + (match-lambda >> + (($ mcron '()) ; no jobs to run >> + '()) >> + (($ mcron jobs) >> + (let ((files (job-files mcron jobs))) >> + (list (shepherd-service >> + (documentation "User cron jobs.") >> + (provision '(mcron)) >> + (modules `((srfi srfi-1) >> + (srfi srfi-26) >> + (ice-9 popen) ; for the 'schedule' action >> + (ice-9 rdelim) >> + (ice-9 match) >> + ,@%default-modules)) >> + (start #~(make-forkexec-constructor >> + (list #$(file-append mcron "/bin/mcron") #$@files) >> + #:log-file (string-append >> + (or (getenv "XDG_LOG_HOME") >> + (format #f "~a/.local/var/log" >> + (getenv "HOME"))) >> + "/mcron.log"))) >> + (stop #~(make-kill-destructor)) >> + (actions >> + (list (shepherd-schedule-action mcron files))))))))) >> + >> +(define home-mcron-profile (compose list home-mcron-configuration-package)) >> + >> +(define (home-mcron-extend config jobs) >> + (home-mcron-configuration >> + (inherit config) >> + (jobs (append (home-mcron-configuration-jobs config) >> + jobs)))) >> + >> +(define home-mcron-service-type >> + (service-type (name 'home-mcron) >> + (extensions >> + (list (service-extension >> + home-shepherd-service-type >> + home-mcron-shepherd-services) >> + (service-extension >> + home-profile-service-type >> + home-mcron-profile))) >> + (compose concatenate) >> + (extend home-mcron-extend) >> + (default-value (home-mcron-configuration)) >> + (description >> + "Install and configure the GNU mcron cron job manager."))) >> diff --git a/gnu/local.mk b/gnu/local.mk >> index 31ad1a43db..8212bc5391 100644 >> --- a/gnu/local.mk >> +++ b/gnu/local.mk >> @@ -80,6 +80,7 @@ GNU_SYSTEM_MODULES = \ >> %D%/home-services/configuration.scm \ >> %D%/home-services/shells.scm \ >> %D%/home-services/shepherd.scm \ >> + %D%/home-services/mcron.scm \ >> %D%/home-services/utils.scm \ >> %D%/home-services/xdg.scm \ >> %D%/image.scm \ >> -- >> 2.33.0 From f93bb50483246e3c2c8df669231b13cb85578bfb Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 13 Sep 2021 09:39:18 +0300 Subject: [PATCH] fixup! home-services: Add Mcron. --- doc/guix.texi | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a7eacad762..419d9429d6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16090,9 +16090,9 @@ This is the type of the @code{mcron} service, whose value is an @code{mcron-configuration} object. This service type can be the target of a service extension that provides -it additional job specifications (@pxref{Service Composition}). In -other words, it is possible to define services that provide additional -mcron jobs to run. +additional job specifications (@pxref{Service Composition}). In other +words, it is possible to define services that provide additional mcron +jobs to run. @end defvr @deftp {Data Type} mcron-configuration @@ -35689,17 +35689,19 @@ The @code{(gnu home-services mcron)} module provides an interface to GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, mcron, GNU@tie{}mcron}). The information about system's mcron is applicable here (@pxref{Scheduled Job Execution}), the only difference -for home services is that they have to be declared in -@code{home-envirnoment} record instead of @code{operating-system}. +for home services is that they have to be declared in a +@code{home-envirnoment} record instead of an @code{operating-system} +record. @defvr {Scheme Variable} home-mcron-service-type This is the type of the @code{mcron} home service, whose value is an -@code{home-mcron-configuration} object. It allows to manage tasks +@code{home-mcron-configuration} object. It allows to manage scheduled +tasks. This service type can be the target of a service extension that provides -it additional job specifications (@pxref{Service Composition}). In -other words, it is possible to define services that provide additional -mcron jobs to run. +additional job specifications (@pxref{Service Composition}). In other +words, it is possible to define services that provide additional mcron +jobs to run. @end defvr @deftp {Data Type} home-mcron-configuration -- 2.33.0