From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id cLV4NIzhl2WUlwAAkFu2QA (envelope-from ) for ; Fri, 05 Jan 2024 12:01:32 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id OEXSLYzhl2XASQAAe85BDQ (envelope-from ) for ; Fri, 05 Jan 2024 12:01:32 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=F1siMQbs; 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=1704452492; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=i6PJGg6e8XpPz2KWf9m7OTn+QkMgOuEj2ZrzfsQUCb0=; b=ZiSm/wELUXPNYKAaYhAlilXneGNpCH/1sQLNF3sQmqXBqW7/xEuDeb+81JRwNPRwRF3do3 OaYOrX7LQ71C6bcK5RHtt0eM+W8QRxqFqKulRxO+B4/lOuoX6NwYwk8C+yqYYEISzLErgA pxsqvrS7UZlYx/0SNn0fiN9tHcl5h2dY08gsHjS5HFXMADOaDc8lXYiG6ITnLN+oxBsejB dmhQm/3tQAHX3ouOP6CMCji8MWCvmuIVDaQTlogv/+eXwKEavg/OLaU655mtOKvG0giMeS IPdSbEFCZVFta8muJGdQbzKkexPnQQRz9jXkqqte04nKqeexMlcMxhactx6y9g== 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=F1siMQbs; 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=1704452492; a=rsa-sha256; cv=none; b=W5ccglOs+G+8Ib/5wDXN+3Tk8JbRFECBnn1FvtgarVZiI3PDP5r3WH0SUNfQG/LLAByIj8 76LQWeOV6ff6Qtno9XHjym1tGIx3riZqUAIxhTpBjpgpqORMJVWRpqlA9wUl2kn2a7Rhi/ vTXBIXJ9xdANZh5CM0DMF5MIq2Z03hI6dCpOXEmDIf3kp6luvNRxrXRDUkrncOmqGbGWRt kk563LMXpZpQa5gL/M8xnZjjzf1C3Gbx+x9XYdx71JjVaJhZOe1/jp8UbPkPYspoBft3ue c/V3iJ3G/Oz9fjm7QJD8VYtmnygrdzAw90cB8b6WkODu8MUzAF/6WQu7+A0aBA== 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 858F945B1E for ; Fri, 5 Jan 2024 12:01:32 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLhwn-000547-C5; Fri, 05 Jan 2024 06:01:05 -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 1rLhwh-0004xb-Sg for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:00 -0500 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 1rLhwh-00055p-Jf for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLhwl-0004Fe-Qr for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68258] [PATCH 6/7] home: services: shepherd: Use the 0.10.x interface. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68258@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , ( , Andrew Tropin , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: ( , Andrew Tropin , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 68258-submit@debbugs.gnu.org id=B68258.170445241210253 (code B ref 68258); Fri, 05 Jan 2024 11:01:03 +0000 Received: (at 68258) by debbugs.gnu.org; 5 Jan 2024 11:00:12 +0000 Received: from localhost ([127.0.0.1]:56477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvw-0002eZ-B6 for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvr-0002HJ-94 for 68258@debbugs.gnu.org; Fri, 05 Jan 2024 06:00: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 1rLhvh-0004h4-O1; Fri, 05 Jan 2024 05:59:57 -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=i6PJGg6e8XpPz2KWf9m7OTn+QkMgOuEj2ZrzfsQUCb0=; b=F1siMQbsTWOHgYrN5dCE FYvdgHoP/O9i8xY+92VDPKaeeFVGqDXYdOJJxUpDWE0eGcjHUqyjuvjxx/3QWstF4Wm/gk4L8yNTS dSFlw53jVlJo0gr3PGxFA2HnoBF7iKgwtrI37rlyFkWTuf67sNRKzFfUoKppCX5F7XOobohms/JIb AbaV/loZbCmU/WvRvxdanCIvd3OUqLXnHSOoadt2Z78X6BsbrQx3OZlSCjkrKHVqdbiDiYOpN2rc9 u3Y6q51nQmejKcggE5w+w7++EjmmjyY+qujp4XoRNGtBuwEYwokBZIrk0VFA2xbS+L2WZlUNSC+fa KMX2lOOGm1ur+g==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 5 Jan 2024 11:59:33 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.97 X-Spam-Score: -5.97 X-Migadu-Queue-Id: 858F945B1E X-TUID: jiMvobs7Ijn7 * gnu/home/services/shepherd.scm (home-shepherd-configuration-file): Pass ‘register-services’ a list. Call ‘start-in-the-background’ unconditionally. Change-Id: Id7ba005949653a9ac065c47eddb425df4f4792aa --- gnu/home/services/shepherd.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm index bd068c37fc..176f4575cb 100644 --- a/gnu/home/services/shepherd.scm +++ b/gnu/home/services/shepherd.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021, 2023 Andrew Tropin ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2024 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,11 +76,8 @@ (define (home-shepherd-configuration-file config) #~(begin (use-modules (srfi srfi-34) (system repl error-handling)) - (apply - register-services - (map - (lambda (file) (load file)) - '#$files)) + + (register-services (map load '#$files)) #$@(if daemonize? `((action 'root 'daemonize)) @@ -90,9 +88,7 @@ (define (home-shepherd-configuration-file config) '#$(append-map shepherd-service-provision (filter shepherd-service-auto-start? services)))) - (if (defined? 'start-in-the-background) - (start-in-the-background services-to-start) - (for-each start services-to-start)) + (start-in-the-background services-to-start) (redirect-port (open-input-file "/dev/null") (current-input-port))))) -- 2.41.0