From unknown Fri Jun 20 07:23:47 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#74997 <74997@debbugs.gnu.org> To: bug#74997 <74997@debbugs.gnu.org> Subject: Status: [PATCH 1/5] import: utils: Rename guix-name to downstream-package-name. Reply-To: bug#74997 <74997@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:23:47 +0000 retitle 74997 [PATCH 1/5] import: utils: Rename guix-name to downstream-pac= kage-name. reassign 74997 guix-patches submitter 74997 Herman Rimm severity 74997 normal tag 74997 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 20 12:33:27 2024 Received: (at submit) by debbugs.gnu.org; 20 Dec 2024 17:33:27 +0000 Received: from localhost ([127.0.0.1]:43894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgsQ-0004as-UF for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:33:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:37846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgsO-0004ai-9r for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:33:25 -0500 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 1tOgsN-0006Q0-R7 for guix-patches@gnu.org; Fri, 20 Dec 2024 12:33:24 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1tOgsL-0004WE-89 for guix-patches@gnu.org; Fri, 20 Dec 2024 12:33:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734715994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=omTJOqC55pPW78GSKunJkwx4C8V8fprVyTeIAE6IbX4=; b=KcxuCcG9ctw8DFU+3n+7Fw6SxamfsakGj0ZZ/GfZEIBPost3Nq3IHjcAap9jQm9WWr4Bum ELma7uryXqASSK42iY3to6XEEGNjs8cHX1GNi8YkWVH+Ah7BvtbSmSsIUHGslF+hMiO0AT 8sskZ5mK3SfVSFHgjGdvQTT+xzSyKy4m9fGL0etKh4pB0Fa8GwsIY1W1R/AYnk1ok2Jtdv 4eyu9CN69Nv8ujVhJ42+goDlbONWOpro46qkTHBLZNyFwczdaCYmpQj/htVGyvb3Rk+U3R 2a2vNRMarrF4HEVexeLmlHgjFX9QE0KAQlzbrINUzfXxtjiQA/l3Q7L+fmFIFg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 07d1142e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Fri, 20 Dec 2024 17:33:14 +0000 (UTC) From: Herman Rimm To: guix-patches@gnu.org Subject: [PATCH 1/5] import: utils: Rename guix-name to downstream-package-name. Date: Fri, 20 Dec 2024 18:32:32 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Andrew Tropin , Efraim Flashner , Katherine Cox-Buday , Laurent Gatto , Liliana Marie Prikler , Ricardo Wurmus , Simon Tournier Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * guix/import/cran.scm (cran-guix-name): Adjust. * guix/import/crate.scm (crate-name->package-name): Adjust. * guix/import/elpa.scm (elpa-guix-name): Adjust. * guix/import/npm-binary.scm (npm-name->name): Adjust. * guix/import/utils.scm (downstream-package-name): Add procedure. [description]: Use definite article, uppercase 'name' argument. (guix-name): Deprecate. Change-Id: I374892be18fbeaae1bc051b8d0c79ca4c33ed8c4 --- guix/import/cran.scm | 2 +- guix/import/crate.scm | 2 +- guix/import/elpa.scm | 2 +- guix/import/npm-binary.scm | 2 +- guix/import/utils.scm | 8 ++++++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index fe69cb87f7..3bea9439e1 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -478,7 +478,7 @@ (define (transform-sysname sysname) ("zlib1g-dev" "zlib") (_ sysname))) -(define cran-guix-name (cut guix-name "r-" <>)) +(define cran-guix-name (cut downstream-package-name "r-" <>)) (define (directory-needs-fortran? dir) "Check if the directory DIR contains Fortran source files." diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 5996571cda..c50f0a8415 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -467,7 +467,7 @@ (define (guix-package->crate-name package) ((name _ ...) name)))) (define (crate-name->package-name name) - (guix-name "rust-" name)) + (downstream-package-name "rust-" name)) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 46b6dc98a2..b86a6a546b 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -481,7 +481,7 @@ (define %elpa-updater (pred package-from-elpa-repository?) (import latest-release))) -(define elpa-guix-name (cut guix-name "emacs-" <>)) +(define elpa-guix-name (cut downstream-package-name "emacs-" <>)) (define* (elpa-recursive-import package-name #:optional (repo 'gnu)) (recursive-import package-name diff --git a/guix/import/npm-binary.scm b/guix/import/npm-binary.scm index 6dfedc4910..92ac7d338e 100644 --- a/guix/import/npm-binary.scm +++ b/guix/import/npm-binary.scm @@ -178,7 +178,7 @@ (define (npm-name->name npm-name) (define (clean name) (string-map (lambda (chr) (if (char=? chr #\/) #\- chr)) (string-filter (negate (cut char=? <> #\@)) name))) - (guix-name "node-" (clean npm-name))) + (downstream-package-name "node-" (clean npm-name))) (define (name+version->symbol name version) (string->symbol (string-append name "-" version))) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index e45c8dfb20..0b1b3b3298 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -37,6 +37,7 @@ (define-module (guix import utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix discovery) #:use-module (guix build-system) #:use-module ((guix i18n) #:select (G_)) @@ -82,6 +83,7 @@ (define-module (guix import utils) read-lines chunk-lines + downstream-package-name guix-name recursive-import)) @@ -612,14 +614,16 @@ (define* (chunk-lines lines #:optional (pred string-null?)) (reverse res) (loop (cdr after) res)))))) -(define (guix-name prefix name) - "Return a Guix package name for a given package name." +(define (downstream-package-name prefix name) + "Return the Guix package name for a given package NAME." (string-append prefix (string-map (match-lambda (#\_ #\-) (#\. #\-) (chr (char-downcase chr))) name))) +(define-deprecated/alias guix-name downstream-package-name) + (define (topological-sort nodes node-dependencies node-name) base-commit: 7f91b12fe31baa0838ae2e942d4515911e71b137 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 20 12:35:56 2024 Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:56 +0000 Received: from localhost ([127.0.0.1]:43916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOguo-0004mf-Lt for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:56 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46013 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgum-0004mD-9H for 74997@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734716146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=blJyxyxoc5TqczlJC20HdsFPd1qut/ny99vIuEvIiUM=; b=gRsklu4HoWy1Onun7Usr8MEnNCGyFd+l8vM02/q71SyotqdH4voppRltslOkCTtHCuaa+r pvcsJkCKVHU/9cb00EhscDPVfq+QFxinOSzLZSWZYXjYwdXc8kx/r7iz2PKgDfayjRpG9j 4APtlxBg99ptYOZJiZGSbLJzK/px4aXoqkGtCs6Z20Oynn64cj1bySpWMwBi/Vs9bWvnx0 Jnr742NDsZe/bOAtGYsqXEs+81ZKOcToryDx37DHg0gjiIZV/XQ1LOxmkKDnpxfD9ckhPf nWcGPut6neiGHYoACm+GQ5N+2/X/5UvUgUo06TRQ7ArqS/RdcHOGBR/ziqT52Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 1b26efb6 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74997@debbugs.gnu.org>; Fri, 20 Dec 2024 17:35:46 +0000 (UTC) From: Herman Rimm To: 74997@debbugs.gnu.org Subject: [PATCH 2/5] import: texlive: Remove guix-name. Date: Fri, 20 Dec 2024 18:35:02 +0100 Message-ID: <637157ea86bca3acf0dc63f243b9b0c642e4ec75.1734715617.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Nicolas Goaziou Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74997 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/import/texlive.scm (guix-name): Remove. (list-upstream-inputs, tlpdb->package): Use downstream-package-name. Change-Id: I8f04d27a42f762c5604cb8874042fabbbe1e9873 --- guix/import/texlive.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 6d04cc25ee..8ce22a1d59 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -334,15 +334,6 @@ (define string->license ((lst ...) `(list ,@(map string->license lst))) (x `(error unknown-license ,x)))) -(define (guix-name name) - "Return a Guix package name for a given Texlive package NAME." - (string-append "texlive-" - (string-map (match-lambda - (#\_ #\-) - (#\. #\-) - (chr (char-downcase chr))) - name))) - (define* (filter-depends depends #:optional texlive-only) "Filter upstream package names DEPENDS to include only their equivalent Guix package names, without \"texlive-\" prefix. When TEXLIVE-ONLY is true, ignore @@ -578,7 +569,8 @@ (define (list-upstream-inputs upstream-name version database) (map (lambda (input-name) (upstream-input (name input-name) - (downstream-name (guix-name input-name)) + (downstream-name (downstream-package-name "texlive-" + input-name)) (type 'propagated))) (sort (append (filter-depends (or (assoc-ref package-data 'depend) '())) @@ -655,7 +647,7 @@ (define (texlive->svn-multi-reference upstream-name version database) (define (tlpdb->package upstream-name version database) (and-let* ((data (assoc-ref database upstream-name)) - (name (guix-name upstream-name)) + (name (downstream-package-name "texlive-" upstream-name)) (reference (texlive->svn-multi-reference upstream-name version database)) (source (with-store store -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 20 12:35:58 2024 Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:58 +0000 Received: from localhost ([127.0.0.1]:43919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgur-0004n3-Pt for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:58 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46013 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgun-0004mD-FY for 74997@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734716146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FNiZV16DVl+v9tOWOXt1Jg/qFHHhOrF/yWnRsJTDfCU=; b=TmpZgGbdg/MG2p2wrI9r8cN1oRlQGEJ9vaclmcvbMbsrjuEL/AJk0TWjBu05ESkPs2z0nQ fgVaz3ZVNKq/zekyUXURrSMCl5TeV/9h3RjEI9URDO7OBVTmeZt3tgFzfAXQ03sZY9g0Nu OkhLkGi9phJ6Bxy5xOIO9pfJsoNKA+2e/WUGHeopa/+2pA4Ppla9P1tcNfW+kgCSGD7P46 76hRGwpIWQDE5qv22FLLSvLj+2rEVut5Nli+D03H51unpqGi4LuSXBr3u98Spcrqdrll4+ 6DuKOr43/Gkl96X5lJ9b2Xjdm+URtlzBjjXBsPkM1tuy4266t83A6Wn0o0EmPw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9f20b1a0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74997@debbugs.gnu.org>; Fri, 20 Dec 2024 17:35:46 +0000 (UTC) From: Herman Rimm To: 74997@debbugs.gnu.org Subject: [PATCH 3/5] import: utils: Move downstream-package-name to (guix utils). Date: Fri, 20 Dec 2024 18:35:03 +0100 Message-ID: <22e9c6d15adb7a3dca3afb76ba2407c076b94af2.1734715617.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Andrew Tropin , Christopher Baines , Josselin Poiret , Katherine Cox-Buday , Liliana Marie Prikler , Ludovic Courtès , Mathieu Othacehe , Nicolas Goaziou , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74997 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/import/elpa.scm: Import (guix utils). * guix/import/texlive.scm: Import (guix utils). * guix/import/utils.scm (downstream-package-name): Move to ... * guix/utils.scm (downstream-package-name): ... here. Change-Id: If56a452f64ed06c8bb06a96a283a5067cb54d602 --- guix/import/elpa.scm | 1 + guix/import/texlive.scm | 1 + guix/import/utils.scm | 9 --------- guix/utils.scm | 9 +++++++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index b86a6a546b..62b1d645ac 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -44,6 +44,7 @@ (define-module (guix import elpa) #:use-module (guix git) #:use-module (guix hash) #:use-module (guix store) + #:use-module ((guix utils) #:select (downstream-package-name)) #:use-module (guix base32) #:use-module (guix upstream) #:use-module (guix packages) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 8ce22a1d59..8e67d11c69 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -35,6 +35,7 @@ (define-module (guix import texlive) #:use-module (guix store) #:use-module (guix svn-download) #:use-module (guix upstream) + #:use-module ((guix utils) #:select (downstream-package-name)) #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (ice-9 popen) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 0b1b3b3298..6f5efa790e 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -83,7 +83,6 @@ (define-module (guix import utils) read-lines chunk-lines - downstream-package-name guix-name recursive-import)) @@ -614,14 +613,6 @@ (define* (chunk-lines lines #:optional (pred string-null?)) (reverse res) (loop (cdr after) res)))))) -(define (downstream-package-name prefix name) - "Return the Guix package name for a given package NAME." - (string-append prefix (string-map (match-lambda - (#\_ #\-) - (#\. #\-) - (chr (char-downcase chr))) - name))) - (define-deprecated/alias guix-name downstream-package-name) (define (topological-sort nodes diff --git a/guix/utils.scm b/guix/utils.scm index 537d0490e0..2d82329cb7 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -91,6 +91,7 @@ (define-module (guix utils) %current-system %current-target-system package-name->name+version + downstream-package-name target-linux? target-hurd? system-hurd? @@ -706,6 +707,14 @@ (define* (package-name->name+version spec (idx (values (substring spec 0 idx) (substring spec (1+ idx)))))) +(define (downstream-package-name prefix name) + "Return the Guix package name for a given package NAME." + (string-append prefix (string-map (match-lambda + (#\_ #\-) + (#\. #\-) + (chr (char-downcase chr))) + name))) + (define* (target-linux? #:optional (target (or (%current-target-system) (%current-system)))) "Does the operating system of TARGET use the Linux kernel?" -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 20 12:35:58 2024 Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:59 +0000 Received: from localhost ([127.0.0.1]:43921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgus-0004n7-9C for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:58 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46013 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOguo-0004mD-BC for 74997@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734716146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PXvJHN2kTOevePUdDaPlGt09v/c5ZE33yCY66SOmjr4=; b=CnrR3rb8KE/JzHIKn9nIRaK2FPlOxxN3RtO7YIjpTEb9ncYthF2v26C/DtWx4OryZAtl0U ls1nv3yL25sQEBxHX0Z3aZVo7VycyXIWL0VgjxLycqV/tBRa3hrfjAZp2b2vczmckRJgm3 o/Gbpm/yifjrI88V75DS5HT3Fqx3j6fxngilZhfhVoYfoWoTkOlwR6sqOxISkyNdtOZ/ZO Nbs7U3LPQ12gqqF17dX8ux/bLpsmeLdbweH3CYquKrmiG6qixKSCTpuVYCu/aobUgaP9Xg Li6SY4LqX3ItV6t9mhqh+Ik/Zp9si/h/1u1x2WfF34+R64Bybx2BtL7K8NB9kg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 562dbf05 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74997@debbugs.gnu.org>; Fri, 20 Dec 2024 17:35:46 +0000 (UTC) From: Herman Rimm To: 74997@debbugs.gnu.org Subject: [PATCH 4/5] gnu: make-arm-trusted-firmware: Use downstream-package-name. Date: Fri, 20 Dec 2024 18:35:04 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74997 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/firmware.scm (make-arm-trusted-firmware): Use downstream-package-name. [arguments]: Remove configure phase, use fix-cross-build phase instead. (arm-trusted-firmware-sun50i-a64): Return base package directly. Change-Id: I23f05ac5e8e897037cd8d8afc4e747b05e56e32d --- gnu/packages/firmware.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 89d29b8add..04f138f22c 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1108,7 +1108,7 @@ (define* (make-arm-trusted-firmware platform #:key ;;%current-system is a *triplet*, unlike its name would suggest. (string=? (%current-system) (gnu-triplet->nix-system triplet)))) (package - (name (string-append "arm-trusted-firmware-" platform)) + (name (downstream-package-name "arm-trusted-firmware-" platform)) (version "2.12") (source (origin @@ -1131,7 +1131,7 @@ (define* (make-arm-trusted-firmware platform #:key #:target (and (not (native-build?)) triplet) #:phases #~(modify-phases %standard-phases - (replace 'configure ;no configure script + (add-after 'unpack 'fix-cross-build ;; Fix ATF commit ffb7742125def3e0acca4c7e4d3215af5ce25a31 (lambda _ (unless #$(native-build?) @@ -1140,6 +1140,7 @@ (define* (make-arm-trusted-firmware platform #:key (substitute* "make_helpers/build_macros.mk" (("-oc") "-oc-default") (("-od") "-od-default"))))) + (delete 'configure) ;no configure script (replace 'install (lambda _ (for-each (lambda (file) @@ -1171,10 +1172,7 @@ (define* (make-arm-trusted-firmware platform #:key license:bsd-2)))) ; libfdt (define-public arm-trusted-firmware-sun50i-a64 - (let ((base (make-arm-trusted-firmware "sun50i_a64"))) - (package - (inherit base) - (name "arm-trusted-firmware-sun50i-a64")))) + (make-arm-trusted-firmware "sun50i_a64")) (define-public arm-trusted-firmware-rk3328 (make-arm-trusted-firmware "rk3328")) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 20 12:35:59 2024 Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:59 +0000 Received: from localhost ([127.0.0.1]:43923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgus-0004nF-SN for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:59 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46013 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgup-0004mD-8i for 74997@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734716147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CIknja4aHFEd5dUDTVdyvbX3Vjd80AxQJuZU5QbpGP4=; b=RS9YLlAv6w54ZCWH1uCoo8nywQZCTBmAaoOuhMscIcwd0D+wVfCWpibuubk5woAwDou4dy /Gxt0aIml3PZ2PHN0LRfNBEDAyelt3EN/MCpu4Ro+l3vXfWPEJFo0BGiWDztfwMWPHlbM1 m1cJkJ3nrMy2xIGjYhPT7RoHVh7EDgw5jnu9nKu27NHnEGYdxQ8HjBdTgorq53Ni698PV3 +ukPLqAioWHBcIS1aqruYCp0XU9KKID152DfFuV/Z9zpICyBsIDt8SyFzSFTQ85q6hu9wj b9k37t8KN2T39P8BRR2uEUdIn3qUCZ5bMIxwL+dNKUIfYIqwxCKP2i+gyRcM4Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c11f5a31 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74997@debbugs.gnu.org>; Fri, 20 Dec 2024 17:35:47 +0000 (UTC) From: Herman Rimm To: 74997@debbugs.gnu.org Subject: [PATCH 5/5] gnu: u-boot: Use downstream-package-name. Date: Fri, 20 Dec 2024 18:35:05 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74997 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot): Use downstream-package-name. Change-Id: I7226519a676ba201be3a95078112b6514a201731 --- gnu/packages/bootloaders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 3122a185dd..b5cfacca4b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1041,9 +1041,7 @@ (define*-public (make-u-boot-package board triplet (gnu-triplet->nix-system triplet)))))) (package (inherit u-boot) - (name (string-append "u-boot-" - (string-replace-substring (string-downcase board) - "_" "-") + (name (string-append (downstream-package-name "u-boot-" board) (or name-suffix ""))) (description (if append-description (string-append (package-description u-boot) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 07:45:31 2024 Received: (at 74997-done) by debbugs.gnu.org; 30 Dec 2024 12:45:31 +0000 Received: from localhost ([127.0.0.1]:57701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSF9G-0007mn-Ml for submit@debbugs.gnu.org; Mon, 30 Dec 2024 07:45:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSF9E-0007mS-4o for 74997-done@debbugs.gnu.org; Mon, 30 Dec 2024 07:45:29 -0500 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 1tSF92-0007VF-Eu; Mon, 30 Dec 2024 07:45:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=1cmxjMcfvrFVecoH9p5LC3mEGtFprhW9cvmWSFdwapk=; b=KlW5JdBWu/EOMcJ+orlR +ONs25bL+1eXj6evFlRq6dXBYpa9hYV80+e/XDg+PE3Wrj4qsdvv2l9cA6rFO7Va0kHkAu2PZB903 jsaTr3GDpRoH/UZ9zolArLFQeBNtYI0g024ntUzt34NFLLK3hActgYbdDzmTwxjFEht93GKdmMxht EH9+aLwVJkpAfrsAvTmf9/UeNH/PTm49PrMQs5+EAaYUDYpiin2b+tDEo+m0LLnlajru6wicBrQHU GylpohrRmXDwoQT50YQ0Mz8RWeYDdICh6Z1mNulkaNnxRGKd4v45ZmYyy2/YjvGxEoLOfz0/J1U60 bhYY93USQffKSA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Herman Rimm Subject: Re: [bug#74997] [PATCH 1/5] import: utils: Rename guix-name to downstream-package-name. In-Reply-To: (Herman Rimm's message of "Fri, 20 Dec 2024 18:32:32 +0100") References: Date: Mon, 30 Dec 2024 13:45:00 +0100 Message-ID: <87pll9s5kj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74997-done Cc: Efraim Flashner , Simon Tournier , Katherine Cox-Buday , Liliana Marie Prikler , Andrew Tropin , Ricardo Wurmus , Laurent Gatto , 74997-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Applied, thanks! From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 17 17:20:06 2025 Received: (at 74997) by debbugs.gnu.org; 17 Jan 2025 22:20:06 +0000 Received: from localhost ([127.0.0.1]:39125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYuhA-0002QE-CL for submit@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35810) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tYuh6-0002P0-Ih for 74997@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:02 -0500 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 1tYuh1-0002L6-A0; Fri, 17 Jan 2025 17:19:55 -0500 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=hauk8xGQY6hjAZ9vhh9Qk3SigJI9htiY0MI/z856ATU=; b=bBCGOGjgJz9h74kZgoLd WtXuvAoYQjWS6ZRWgXoo9HZt7Xyfa5Y3xo3Bm5oiY0c6fqqKLiEqciFH8hewf1eMlKMxsmCpOeXP0 lMgXT6mtr3Ocs9pSutD0iOiBxmCnx5/OvU6yLMYKU9N+aRq++zmSJQWYQqzZ+wt6reTPuWvpIbEh7 3atANJoloa4XYThTYE4OYfL+c0GswBu41Ih1MCpOl71NDlu6Pr/Q1hrKB+MVi31CzOPulYJjaEHE8 zEuSgriAfjxTN2aOPn6zxrkI91U8zf11bnE/Os53rlC1vIt45opH6JpEjDq9HQ/FkafgUXv0TxU04 imDPTfYeH65lPw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 74997@debbugs.gnu.org Subject: [PATCH 1/4] =?UTF-8?q?services:=20shepherd:=20Add=20=E2=80=98tran?= =?UTF-8?q?sient=E2=80=99=20and=20=E2=80=98timer=E2=80=99.?= Date: Fri, 17 Jan 2025 23:19:20 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Herman Rimm , Ludovic Courtès , Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74997 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/services/shepherd.scm (shepherd-timer-service-type) (shepherd-transient-service-type): New variables. * doc/guix.texi (Shepherd Services): Document them. Change-Id: I9b622e7e947e7a6384c2701a313d0c7080a0a5f6 --- doc/guix.texi | 33 ++++++++++++++++++++++++ gnu/services/shepherd.scm | 54 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 0015d739bb..3e377ca9f4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -45684,6 +45684,39 @@ Shepherd Services (shepherd my-shepherd)))))) @end lisp +@cindex @code{transient} service, Shepherd +@defvar shepherd-transient-service-type +This service type represents the Shepherd's @code{transient} service, +which lets you spawn commands in the background and interact with them +as regular Shepherd service; it is similar to @command{systemd-run}. + +For example, the command below spawns @command{rsync} in the background, +in an environment where the @env{SSH_AUTH_SOCK} environment variable has +the given value: + +@example +herd spawn transient -E SSH_AUTH_SOCK=$SSH_AUTH_SOCK -- \ + rsync -e ssh -vur . backup.example.org: +@end example + +@xref{Transient Service Maker,,, shepherd, The GNU Shepherd Manual}, for +more info on the @code{transient} service. +@end defvar + +@cindex @code{timer} service, Shepherd +@defvar shepherd-timer-service-type +This is the service type representing the Shepherd's @code{timer} +service, which lets you schedule the execution of commands, similar to +the venerable @command{at} command. Here is an example: + +@example +herd schedule timer at 07:00 -- mpg123 Music/alarm.mp3 +@end example + +@xref{Timer Service,,, shepherd, The GNU Shepherd Manual}, for more info +on the @code{timer} service. +@end defvar + @defvar %shepherd-root-service This service represents PID@tie{}1. @end defvar diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 0de3c9c55c..5f2625ac20 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2016, 2018-2024 Ludovic Courtès +;;; Copyright © 2013-2016, 2018-2025 Ludovic Courtès ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2018 Carlo Zancanaro ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen @@ -81,6 +81,8 @@ (define-module (gnu services shepherd) shepherd-service-upgrade user-processes-service-type + shepherd-timer-service-type + shepherd-transient-service-type assert-valid-graph)) @@ -668,4 +670,52 @@ (define user-processes-service-type seconds after @code{SIGTERM} has been sent are terminated with @code{SIGKILL}."))) -;;; shepherd.scm ends here + +;;; +;;; Timer and transient service maker. +;;; + +(define shepherd-timer-service-type + (shepherd-service-type + 'shepherd-timer + (const (shepherd-service + (provision '(timer)) + (requirement '(user-processes)) + (modules '((shepherd service timer))) + (free-form #~(timer-service + '#$provision + #:requirement '#$requirement)))) + #t ;ignored + (description "The Shepherd @code{timer} service lets you schedule commands +dynamically, similar to the @code{at} command that your grandparents would use +on that Slackware they got on a floppy disk. For example, consider this +command: + +@example +herd schedule timer at 07:00 -- mpg123 Music/alarm.mp3 +@end example + +It does exactly what you would expect."))) + +(define shepherd-transient-service-type + (shepherd-service-type + 'shepherd-transient + (const (shepherd-service + (provision '(transient)) + (requirement '(user-processes)) + (modules '((shepherd service transient))) + (free-form #~(transient-service + '#$provision + #:requirement '#$requirement)))) + #t ;ignored + (description "The Shepherd @code{transient} service lets you run commands +asynchronously, in the background, similar to @command{systemd-run}, as in +this example: + +@example +herd spawn transient -E SSH_AUTH_SOCK=$SSH_AUTH_SOCK -- \\ + rsync -e ssh -vur . backup.example.org: +@end example + +This runs @command{rsync} in the background, as a service that you can inspect +with @command{herd status} and stop with @command{herd stop}."))) -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 17 17:20:07 2025 Received: (at 74997) by debbugs.gnu.org; 17 Jan 2025 22:20:07 +0000 Received: from localhost ([127.0.0.1]:39129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYuhC-0002Qh-0p for submit@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35808) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tYuh5-0002Oy-CT for 74997@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:02 -0500 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 1tYugz-0002Kh-8l; Fri, 17 Jan 2025 17:19:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=Z9pEvpznIzO/buFkHEk72eDn/8FGWP+bOElrItb46A8=; b=Y5uijoKQMVV76T 7FgSKrU44YvXkD1KxBQGqunLjeNuXnw8co3HBMtv7q3NFHzrRPAOnejuo1PIRmLj3iJEO8uUcMAih TPP0uigErZHIptSikCtJ9gI73kkhCCn9AoDqH1N3LGO0paf1JrZrzTGP7FtrBeCnMzhB8GrNSouVw ys3QXJS1spf3iAUqu/DqibnbQyaoMRxD3dMS4hYObfP1PT3pWC4QGQVv8fk8X5M9CAW7WacEzFOO3 Q0V6lNTi4gvUPyldaSGoU6trRWOSUv8vKRuEAtquWn4WWG2rSO4ZjSNmg0ptiXnEbtHVDJw7WUvJz VNcXhW9H4qXFpLGO8JAQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 74997@debbugs.gnu.org Subject: [PATCH 0/4] Adding the 'timer' and 'transient' Shepherd services Date: Fri, 17 Jan 2025 23:19:19 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Herman Rimm , Ludovic Courtès , Andrew Tropin , Janneke Nieuwenhuizen , Tanguy Le Carrour Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 74997 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Shepherd party! 🐑🎉 This patch series adds the famous ‘transient’ and ‘timer’ services from Shepherd 1.0 that everyone has been waiting for. Thoughts? Ludo’. Ludovic Courtès (4): services: shepherd: Add ‘transient’ and ‘timer’. services: Add the Shepherd’s ‘transient’ and ‘timer’ to ‘%base-services’. home: services: shepherd: Add ‘transient’ and ‘timer’ services. home: services: Add ‘transient’ and ‘timer’ to ‘%base-home-services’. doc/guix.texi | 45 +++++++++++++++++++++++++++ gnu/home.scm | 7 +++-- gnu/home/services/shepherd.scm | 21 +++++++++++-- gnu/services/base.scm | 4 +++ gnu/services/shepherd.scm | 56 ++++++++++++++++++++++++++++++++-- 5 files changed, 127 insertions(+), 6 deletions(-) base-commit: a42d57a935009e4dd9b9e9464458540def2cb576 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 17 17:20:15 2025 Received: (at 74997) by debbugs.gnu.org; 17 Jan 2025 22:20:15 +0000 Received: from localhost ([127.0.0.1]:39136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYuhL-0002WF-5S for submit@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35816) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tYuh8-0002P3-FC for 74997@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:03 -0500 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 1tYuh2-0002LV-Po; Fri, 17 Jan 2025 17:19:56 -0500 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=yT7aNWDnkRmlUk0aoFpJXyl868iZ8OYADbB1ksh1kdo=; b=Fuhg/lDWnD5euccBXUaI I80fE/XXD9Ql0ZLBOWHJXoH6IDLq/nls1TkVdP9JqiQUmxS6nBxVRkKMHulc5nV8brBJjzG9HkwxE FRWnI+lmtsdmG4ecbJHbA5Xg+qqUwt707euValRIOi6qTZBuEKpllx829+bqDR+ZPf2wn+s4clUh6 sTPncEcxndT+OBtkKb0AiTUI1D//qZ/u0ppHrZphRTtM/Y8TtRJhs5SkC1tM3ZLqbQ1GvUxnlr6VQ XKHLOt7zO2oiKnbpx27Kdar89veH+Hkk63ydUC8vvIt9fPMzh26oPJGa0OTdz/2k6Xd6K9YKQpRCV MKEheM6kbcyk0w==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 74997@debbugs.gnu.org Subject: [PATCH 2/4] =?UTF-8?q?services:=20Add=20the=20Shepherd=E2=80=99s?= =?UTF-8?q?=20=E2=80=98transient=E2=80=99=20and=20=E2=80=98timer=E2=80=99?= =?UTF-8?q?=20to=20=E2=80=98%base-services=E2=80=99.?= Date: Fri, 17 Jan 2025 23:19:21 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Herman Rimm , Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74997 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/services/base.scm (%base-services): Add instances of ‘shepherd-timer-service-type’ and ‘shepherd-transient-service-type’. Change-Id: I28a35d0dce40b142ee71b330b1cf7a3d222ef6bd --- gnu/services/base.scm | 4 ++++ gnu/services/shepherd.scm | 34 ++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 5967457002..7331c030d7 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -3750,6 +3750,10 @@ (define %base-services (service log-rotation-service-type) + ;; Convenient services brought by the Shepherd. + (service shepherd-timer-service-type) + (service shepherd-transient-service-type) + ;; Periodically delete old build logs. (service log-cleanup-service-type (log-cleanup-configuration diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 5f2625ac20..328bfbedff 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -678,14 +678,15 @@ (define user-processes-service-type (define shepherd-timer-service-type (shepherd-service-type 'shepherd-timer - (const (shepherd-service - (provision '(timer)) - (requirement '(user-processes)) - (modules '((shepherd service timer))) - (free-form #~(timer-service - '#$provision - #:requirement '#$requirement)))) - #t ;ignored + (lambda (requirement) + (shepherd-service + (provision '(timer)) + (requirement requirement) + (modules '((shepherd service timer))) + (free-form #~(timer-service + '#$provision + #:requirement '#$requirement)))) + '(user-processes) (description "The Shepherd @code{timer} service lets you schedule commands dynamically, similar to the @code{at} command that your grandparents would use on that Slackware they got on a floppy disk. For example, consider this @@ -700,14 +701,15 @@ (define shepherd-timer-service-type (define shepherd-transient-service-type (shepherd-service-type 'shepherd-transient - (const (shepherd-service - (provision '(transient)) - (requirement '(user-processes)) - (modules '((shepherd service transient))) - (free-form #~(transient-service - '#$provision - #:requirement '#$requirement)))) - #t ;ignored + (lambda (requirement) + (shepherd-service + (provision '(transient)) + (requirement requirement) + (modules '((shepherd service transient))) + (free-form #~(transient-service + '#$provision + #:requirement '#$requirement)))) + '(user-processes) (description "The Shepherd @code{transient} service lets you run commands asynchronously, in the background, similar to @command{systemd-run}, as in this example: -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 17 17:20:16 2025 Received: (at 74997) by debbugs.gnu.org; 17 Jan 2025 22:20:16 +0000 Received: from localhost ([127.0.0.1]:39138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYuhL-0002WH-Io for submit@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36652) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tYuhB-0002P7-LQ for 74997@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:06 -0500 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 1tYuh6-0002MA-5L; Fri, 17 Jan 2025 17:20:00 -0500 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=k+2X3Z70cToyD0NvQfPSifNY8fOMJUycuzqUUgkZ8Mo=; b=cCWj278F11FkLgkeXfbs H1t018v0Te5ZlO1cC6yyyyayG+6eObkBHvqSHG8QmUPWAtjt85e/JSq6ZI6p5wTnp9zmIOY1OmAHJ 4kIJJqxBaSLbo8EJNzkbHfx4ZaT0P7r61WUV3AxtxCAw1Oz1yzFZJ3PEKYkIbjJbdNgfXkdO4waCs cIGdjY2Vyw6qAr0YlvfO3TYVEf9vzxjFvXjZ4Kblf7Y3rmXpwA4nvosYCG56Xer8hBDIkWAUly1HE rgUSZZyWC9uZR8oBDIlBWYnZrljkgxyYKvPEoEXr0g+j04XVWyYPyHnQQKVKzFsapW3m8VsGYH2aj QU8TFDPlU82nRw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 74997@debbugs.gnu.org Subject: [PATCH 3/4] =?UTF-8?q?home:=20services:=20shepherd:=20Add=20?= =?UTF-8?q?=E2=80=98transient=E2=80=99=20and=20=E2=80=98timer=E2=80=99=20s?= =?UTF-8?q?ervices.?= Date: Fri, 17 Jan 2025 23:19:22 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Herman Rimm , Ludovic Courtès , Andrew Tropin , Janneke Nieuwenhuizen , Maxim Cournoyer , Tanguy Le Carrour Content-Transfer-Encoding: 8bit X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 74997 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) * gnu/home/services/shepherd.scm (home-shepherd-timer-service-type) (home-shepherd-transient-service-type): New variables. * doc/guix.texi (Shepherd Home Service): Document them. (Shepherd Services): Add anchor. Change-Id: Ia4eb7cf043f4661c64f5ca81b8989a451532aa18 --- doc/guix.texi | 12 ++++++++++++ gnu/home/services/shepherd.scm | 21 +++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3e377ca9f4..a33f2f3083 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -45684,6 +45684,7 @@ Shepherd Services (shepherd my-shepherd)))))) @end lisp +@anchor{shepherd-transient-timer-services} @cindex @code{transient} service, Shepherd @defvar shepherd-transient-service-type This service type represents the Shepherd's @code{transient} service, @@ -47347,6 +47348,17 @@ Shepherd Home Service This service is part of @code{%base-home-services}. @end defvar +@defvar home-shepherd-transient-service-type +@defvarx home-shepherd-timer-service-type +These are the @code{timer} and @code{transient} Shepherd services. The +former lets you schedule command execution for later, while the latter +can run commands in the background as a regular service. + +@xref{shepherd-transient-timer-services, the system @code{timer} and +@code{transient} services}, which are their Guix System counterparts, +for more info. +@end defvar + @node Secure Shell @subsection Secure Shell diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm index 37ad1489d6..b2b141d4de 100644 --- a/gnu/home/services/shepherd.scm +++ b/gnu/home/services/shepherd.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021, 2023 Andrew Tropin ;;; Copyright © 2021 Xinglu Chen -;;; Copyright © 2024 Ludovic Courtès +;;; Copyright © 2024-2025 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,7 +34,10 @@ (define-module (gnu home services shepherd) home-shepherd-configuration-auto-start? home-shepherd-configuration-daemonize? home-shepherd-configuration-silent? - home-shepherd-configuration-services) + home-shepherd-configuration-services + + home-shepherd-transient-service-type + home-shepherd-timer-service-type) #:re-export (shepherd-service shepherd-service? shepherd-service-documentation @@ -181,3 +184,17 @@ (define home-shepherd-service-type (define-service-type-mapping shepherd-root-service-type => home-shepherd-service-type) + +;;; +;;; Timer and transient service maker. +;;; + +(define home-shepherd-timer-service-type + (service-type + (inherit (system->home-service-type shepherd-timer-service-type)) + (default-value '()))) ;requirement + +(define home-shepherd-transient-service-type + (service-type + (inherit (system->home-service-type shepherd-transient-service-type)) + (default-value '()))) ;requirement -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 17 17:20:16 2025 Received: (at 74997) by debbugs.gnu.org; 17 Jan 2025 22:20:16 +0000 Received: from localhost ([127.0.0.1]:39140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYuhM-0002WP-3F for submit@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36666) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tYuhD-0002PR-Cq for 74997@debbugs.gnu.org; Fri, 17 Jan 2025 17:20:08 -0500 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 1tYuh8-0002Nc-15; Fri, 17 Jan 2025 17:20:02 -0500 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=3Wc1I+hodyphu/XxYbt2uoG+30U3kayLyQSKT2t+13k=; b=Nb+LqdGakMgqmGtSsYUi 8eoczTerOrJWGpmR9SX2eiyVnqQJQ7MPSLgczW/XGAjxbYetCIIgO/QS0DsZrPbvyyH7t10skjwPz xOlbVmVqyUam3Ubg0K6rtWaPUfVrglrECec2unaxlRCVaunXoacVEbdMvbJHYmKtLbwOyVW2/ZCkz yqclyPA7TsuK0Z3yS5KUo3U7g2jZCll8QKI51Gna59m5DxqxeJTYdT1u7/6PQL+d0z7gxRuRpfD9d qmtNa5ecczE7MnKuXBmcVwtabPfl/4mPUDU8Jki+5MUQ3X2Ur/uaAajdA5TxsZFRugU5KGBnPJUpo pTIoxQ80xNERig==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 74997@debbugs.gnu.org Subject: [PATCH 4/4] =?UTF-8?q?home:=20services:=20Add=20=E2=80=98transien?= =?UTF-8?q?t=E2=80=99=20and=20=E2=80=98timer=E2=80=99=20to=20=E2=80=98%bas?= =?UTF-8?q?e-home-services=E2=80=99.?= Date: Fri, 17 Jan 2025 23:19:23 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Herman Rimm , Ludovic Courtès , Andrew Tropin , Janneke Nieuwenhuizen , Tanguy Le Carrour Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74997 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/home.scm (%base-home-services): Add ‘home-shepherd-timer-service-type’ and ‘home-shepherd-transient-service-type’. Change-Id: Ib48744b82c7e4c6ff6b8ac3d669774feda813f4b --- gnu/home.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/home.scm b/gnu/home.scm index 3b479f64f9..1172b1a0ab 100644 --- a/gnu/home.scm +++ b/gnu/home.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Andrew Tropin -;;; Copyright © 2022, 2024 Ludovic Courtès +;;; Copyright © 2022, 2024-2025 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ (define-module (gnu home) #:use-module (gnu home services) #:use-module (gnu home services symlink-manager) #:use-module (gnu home services shells) + #:use-module (gnu home services shepherd) #:use-module (gnu home services xdg) #:use-module (gnu home services fontutils) #:use-module (gnu home services admin) @@ -80,7 +81,9 @@ (define-record-type* home-environment (define %base-home-services ;; Non-essential but useful services to have by default. - (list (service home-log-rotation-service-type))) + (list (service home-log-rotation-service-type) + (service home-shepherd-timer-service-type) + (service home-shepherd-transient-service-type))) (define (home-environment-default-essential-services he) "Return the list of essential services for home environment." -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 02:22:08 2025 Received: (at 74997) by debbugs.gnu.org; 19 Jan 2025 07:22:08 +0000 Received: from localhost ([127.0.0.1]:44655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZPdH-0004x4-96 for submit@debbugs.gnu.org; Sun, 19 Jan 2025 02:22:07 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:52438) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZPdE-0004wY-Pj for 74997@debbugs.gnu.org; Sun, 19 Jan 2025 02:22:05 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2165cb60719so60251155ad.0 for <74997@debbugs.gnu.org>; Sat, 18 Jan 2025 23:22:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737271319; x=1737876119; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q2H5qB79HJAZSEpCgnP49Gb5ZF2ZFg3TPW2ScACxW6Q=; b=PM2rSFp+kJblhtLIqDgi6MVkf5BfYrYRwqwZUlkYmqn6R308+b90qV/63I2hwxrBiE MNS88wQYbiJ3hsk+Hu64EkhzEsFGCw6Nf26XvOvRsYrZixjZSxYtKRxh65HCEYFXrsnQ olIMxaqwEo7aCqF8gtxoPogxnfjG3xtFvr2CLcs7dBxEJ1SE1snF+VG3kcM0dajpT8k7 NHQLRDlPDU7ElIyXHVnLbYU9MI7Gbcg12OgQjws/f6ij3lYHCBElx0zuSZfhhljlP7KM 7p2IChnzVuxJZWViQVlSpA5QjIlFXDAZ+A7cV7qsp2SGwNr++6f66W4l/JSZsSLNuJgk FwwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737271319; x=1737876119; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Q2H5qB79HJAZSEpCgnP49Gb5ZF2ZFg3TPW2ScACxW6Q=; b=bY5Qf/rATnMxiQrrSXz/lmTordkn2E0mdKK+h6IC2mLYHQ6FzaDEWC65u4ubcChoHa Zpz4lHoFnwJuF8+s1sYAtDwm2aaUFPZy7jFM8L3mCHpVxDGrjmSqX0PCQw+HtmAuGR6h i+Qelq3ksdPrwDW3ViJMc1DSS4grWCBesRtzy8NIS/YVN3DTBqKLm1AEGeyGKyS4RdN9 R1sILifaRV3uIO3eqt4EZv5+KnYKcIUHdqb2hFUQDJZ0rH27hJluFO6Dl3Hmi+6IVPS2 V9KRCNC5DhePvlKKDaZDaev7UYeWVkGBHqYJw55D7sTHrrnK4aw/EM0djw6p+MDYlFKs T7Lw== X-Gm-Message-State: AOJu0Yw0RXQztonCPJdscLDfpDNNeAnjla3p7vE8w4JQ6SteVf6BiJJ+ s+5sIhQkzG9Fa/yS95dRparysVf1sS4U3igflPTT4Y0jD1iQ1CE5fvGcWP9Ngek= X-Gm-Gg: ASbGncvP27HtAXVDMzjBRZj/8DWN2IWlLt0rNeADDA61IWss+QO22GVm9Hd+AgTSqPe 7ZoreuvN6PL2P4ShzHnmv8z53ClLoZS3+KCD1zNCQTp479R+/ADaUtEhxIc73wJouAWb95BGY2F Th3260CscQaEZ0a637dEsn7s/0ETdrtsYFy7pXlv86TY10jMz4Kd3pwXF6ismdMyd3+u6FPC1U7 LIZwlwF1A4CIOWWu/syzax/kB59UEWAIvVR6z1k36MdQ4pmTBaE/T5wxSdPDUcU7mg= X-Google-Smtp-Source: AGHT+IGBKWFz8j0UWf6X8Ytj7pDQ+LA3GbINDc5DULhaWbp9DaebnsxHfPXo8+930eWwZTzjUv5K9A== X-Received: by 2002:a17:902:fc48:b0:215:787a:f91a with SMTP id d9443c01a7336-21c355eabe6mr153786845ad.44.1737271318837; Sat, 18 Jan 2025 23:21:58 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2ceb786csm40995585ad.60.2025.01.18.23.21.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 23:21:58 -0800 (PST) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#74997] [PATCH 1/4] services: shepherd: Add =?utf-8?B?4oCYdHJhbnNpZW504oCZ?= and =?utf-8?B?4oCYdGltZXLigJku?= In-Reply-To: ("Ludovic =?utf-8?Q?Court=C3=A8s=22's?= message of "Fri, 17 Jan 2025 23:19:20 +0100") References: Date: Sun, 19 Jan 2025 16:21:47 +0900 Message-ID: <87wmer8e0k.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74997 Cc: Herman Rimm , 74997@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludovic, Ludovic Court=C3=A8s writes: > * gnu/services/shepherd.scm (shepherd-timer-service-type) > (shepherd-transient-service-type): New variables. > * doc/guix.texi (Shepherd Services): Document them. > > Change-Id: I9b622e7e947e7a6384c2701a313d0c7080a0a5f6 > --- > doc/guix.texi | 33 ++++++++++++++++++++++++ > gnu/services/shepherd.scm | 54 +++++++++++++++++++++++++++++++++++++-- > 2 files changed, 85 insertions(+), 2 deletions(-) > > diff --git a/doc/guix.texi b/doc/guix.texi > index 0015d739bb..3e377ca9f4 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -45684,6 +45684,39 @@ Shepherd Services > (shepherd my-shepherd)))))) > @end lisp > > +@cindex @code{transient} service, Shepherd > +@defvar shepherd-transient-service-type > +This service type represents the Shepherd's @code{transient} service, > +which lets you spawn commands in the background and interact with them > +as regular Shepherd service; it is similar to @command{systemd-run}. > + > +For example, the command below spawns @command{rsync} in the background, > +in an environment where the @env{SSH_AUTH_SOCK} environment variable has > +the given value: > + > +@example > +herd spawn transient -E SSH_AUTH_SOCK=3D$SSH_AUTH_SOCK -- \ > + rsync -e ssh -vur . backup.example.org: > +@end example Neat! > +@xref{Transient Service Maker,,, shepherd, The GNU Shepherd Manual}, for > +more info on the @code{transient} service. > +@end defvar > + > +@cindex @code{timer} service, Shepherd > +@defvar shepherd-timer-service-type > +This is the service type representing the Shepherd's @code{timer} > +service, which lets you schedule the execution of commands, similar to > +the venerable @command{at} command. Here is an example: > + > +@example > +herd schedule timer at 07:00 -- mpg123 Music/alarm.mp3 > +@end example Also nice, though I'd use 'ogg123 Music/alarm.ogg' to promote more free formats! [...] > -;;; shepherd.scm ends here > + > +;;; > +;;; Timer and transient service maker. > +;;; > + > +(define shepherd-timer-service-type > + (shepherd-service-type > + 'shepherd-timer > + (const (shepherd-service > + (provision '(timer)) > + (requirement '(user-processes)) > + (modules '((shepherd service timer))) > + (free-form #~(timer-service > + '#$provision > + #:requirement '#$requirement)))) > + #t ;ignored > + (description "The Shepherd @code{timer} service lets you schedule com= mands > +dynamically, similar to the @code{at} command that your grandparents wou= ld use > +on that Slackware they got on a floppy disk. For example, consider this > +command: > + > +@example > +herd schedule timer at 07:00 -- mpg123 Music/alarm.mp3 > +@end example Ditto (I'd use Ogg Vorbis in the example). > +It does exactly what you would expect."))) > + > +(define shepherd-transient-service-type > + (shepherd-service-type > + 'shepherd-transient > + (const (shepherd-service > + (provision '(transient)) > + (requirement '(user-processes)) > + (modules '((shepherd service transient))) > + (free-form #~(transient-service > + '#$provision > + #:requirement '#$requirement)))) > + #t ;ignored > + (description "The Shepherd @code{transient} service lets you run comm= ands > +asynchronously, in the background, similar to @command{systemd-run}, as = in > +this example: > + > +@example > +herd spawn transient -E SSH_AUTH_SOCK=3D$SSH_AUTH_SOCK -- \\ > + rsync -e ssh -vur . backup.example.org: > +@end example > + > +This runs @command{rsync} in the background, as a service that you can i= nspect > +with @command{herd status} and stop with @command{herd stop}."))) Neat! Taking into account my previous nitpick: Reviewed-by: Maxim Cournoyer --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 02:24:50 2025 Received: (at 74997) by debbugs.gnu.org; 19 Jan 2025 07:24:51 +0000 Received: from localhost ([127.0.0.1]:44659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZPfu-00051Q-Ix for submit@debbugs.gnu.org; Sun, 19 Jan 2025 02:24:50 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:46422) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZPfs-000519-0l for 74997@debbugs.gnu.org; Sun, 19 Jan 2025 02:24:48 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-21649a7bcdcso60346665ad.1 for <74997@debbugs.gnu.org>; Sat, 18 Jan 2025 23:24:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737271482; x=1737876282; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lECeYtsgWMND2UoeYtgO9P4LXea1XrkitiHuG4dJDnc=; b=QapyLzkFvnoeEGLvvfgjHPzX2VhP48dNMQbGVYBBCD1NbVpmorNS9EgmdOonqNbwvp xJyjJ9WIWAzjqRRqtySZHyJDn5IEI+FDm8CwE91gMdPK4Zh/I4giaY1VieKRsiW1if0x QCbg6YaUiGirJoDlVar2AnChWkAWnMqBdRO1KX0+4occNFp8NaGO6OAP2zkl9Auc4zZt PtlPqzLhCwLJswrxxVAV68T0/BQtbzz/bjVqfuB3uRdiXYN3CzVAVlsutczHn+HZpSXi 0+t/vdmAgfh29vpMeSxRX0+M2+sT+EeXwsCUNBbVFsGdI/r9kAgM3JTzkITS+Rg8jwEi OfgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737271482; x=1737876282; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lECeYtsgWMND2UoeYtgO9P4LXea1XrkitiHuG4dJDnc=; b=iMOAaZVmmjlseCrKLEdMw6LWwe5kx2Y87oAbt4cBq52hdPbrch+cbbyY539VropYGl QiqRWAld5whkLcRNwCht724NBT5E6MZD+RYrZwPmrYV8b7dMtOjlUkp0N5LGWUQJVMPt cFmYlB/sa7LV8x2/EyTzqd6WyaFuKYveuIMZCzsArabj1qTc6a6G6yNxFWsCO7VYzQz+ SZMmH+CW9X2rtyTuwy18ARN2YjmI5AGMvZ2mO3+fiweq8dsz44tPVXOxxXCyOjWrUXRZ vtWe8wGgdXNkh0HPoVsspXor9GNKc9Hwa2cdmuSf+ezPymZs1KMlYTVxz3DgoGYHhHUZ RaNQ== X-Gm-Message-State: AOJu0Yw1bmjWJw2pDtBdk2XMrii5mzZeCDRC0rhY18L7DwGEgmqXwrsm TJqxY1No0t6C7HFQ3g7KjS1dlQiSlb9Q5D9trJfQAT4mRSPKDk9n X-Gm-Gg: ASbGncsdvArSaZJ5FTTRc0nTH7f7hvnXCiNsjuQXXbYc6MgJGDljSI3qt8IRyCFKHdw aT9ogdA13NE5+K98FxcKvaePx3gZwXqxrGyDFC8XojZzo1dcoG2DPJG5SmX5xCH0BHN/wEyjego 84F1m0nJlFfsBpHpWy2VOR8Ca3XnyE/qKXdrrUb1z4FGExINbiOGXntWc0nr+FmHH3aEXeqOSpD 9347Y2+eS/gsmf7+7fMVGuOmsaWO6mMVQWm/HyRZKCHt7Az0t+MPglEgZf+jYAigBo= X-Google-Smtp-Source: AGHT+IF6LBo1k029CRZOTlZ3lS5NDpwLK1hOWra5hWj8yyfnsaXyiqqAEzczp/2//3K0KXSUWtmY7g== X-Received: by 2002:a17:902:da87:b0:216:501e:e314 with SMTP id d9443c01a7336-21c3540d181mr126039425ad.20.1737271481976; Sat, 18 Jan 2025 23:24:41 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d3bc64dsm40138185ad.122.2025.01.18.23.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 23:24:41 -0800 (PST) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#74997] [PATCH 2/4] services: Add the =?utf-8?Q?Shepherd?= =?utf-8?Q?=E2=80=99s_=E2=80=98transient=E2=80=99?= and =?utf-8?B?4oCYdGlt?= =?utf-8?B?ZXLigJk=?= to =?utf-8?Q?=E2=80=98%base-services=E2=80=99=2E?= In-Reply-To: ("Ludovic =?utf-8?Q?Court=C3=A8s=22's?= message of "Fri, 17 Jan 2025 23:19:21 +0100") References: Date: Sun, 19 Jan 2025 16:24:30 +0900 Message-ID: <87sepf8dw1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74997 Cc: Herman Rimm , 74997@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Ludovic Court=C3=A8s writes: > * gnu/services/base.scm (%base-services): Add instances of > =E2=80=98shepherd-timer-service-type=E2=80=99 and =E2=80=98shepherd-trans= ient-service-type=E2=80=99. The above changelog is incomplete (missing the refactor in gnu/services/shepherd.scm) Otherwise, Reviewed-by: Maxim Cournoyer --=20 Thanks, Maxim From unknown Fri Jun 20 07:23:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 16 Feb 2025 12:24:16 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator