From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp12.migadu.com ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms0.migadu.com with LMTPS
	id 0DzgMA2XOGJadAEAgWs5BA
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Mon, 21 Mar 2022 16:17:33 +0100
Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp12.migadu.com with LMTPS
	id YOeoLQ2XOGIEXwEAauVa8A
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Mon, 21 Mar 2022 16:17:33 +0100
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 4B9A411CCB
	for <larch@yhetil.org>; Mon, 21 Mar 2022 16:17:33 +0100 (CET)
Received: from localhost ([::1]:46524 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	id 1nWJmm-0001RH-17
	for larch@yhetil.org; Mon, 21 Mar 2022 11:17:32 -0400
Received: from eggs.gnu.org ([209.51.188.92]:38260)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1nWJmK-0001PZ-37
 for guix-patches@gnu.org; Mon, 21 Mar 2022 11:17:06 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:43974)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1nWJmI-00015X-Se
 for guix-patches@gnu.org; Mon, 21 Mar 2022 11:17:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nWJmI-0001mm-HI
 for guix-patches@gnu.org; Mon, 21 Mar 2022 11:17:02 -0400
X-Loop: help-debbugs@gnu.org
Subject: [bug#54216] [PATCH v4] gnu: shepherd-for-guix: New package for use in
 Guix.
References: <20220301182848.26694-1-attila@lendvai.name>
In-Reply-To: <20220301182848.26694-1-attila@lendvai.name>
Resent-From: Attila Lendvai <attila@lendvai.name>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Mon, 21 Mar 2022 15:17:02 +0000
Resent-Message-ID: <handler.54216.B54216.16478758126349@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 54216
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 54216@debbugs.gnu.org
Cc: Attila Lendvai <attila@lendvai.name>
Received: via spool by 54216-submit@debbugs.gnu.org id=B54216.16478758126349
 (code B ref 54216); Mon, 21 Mar 2022 15:17:02 +0000
Received: (at 54216) by debbugs.gnu.org; 21 Mar 2022 15:16:52 +0000
Received: from localhost ([127.0.0.1]:37871 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1nWJm7-0001e4-Tl
 for submit@debbugs.gnu.org; Mon, 21 Mar 2022 11:16:52 -0400
Received: from mail-ej1-f47.google.com ([209.85.218.47]:41962)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <attila.lendvai@gmail.com>) id 1nWJm5-0001Xo-Be
 for 54216@debbugs.gnu.org; Mon, 21 Mar 2022 11:16:50 -0400
Received: by mail-ej1-f47.google.com with SMTP id a8so30514847ejc.8
 for <54216@debbugs.gnu.org>; Mon, 21 Mar 2022 08:16:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 
 h=sender:from:to:cc:subject:date:message-id:mime-version
 :content-transfer-encoding;
 bh=2blBOk/itWB/Ii7c/Hj/wYU868vN7WZqlClrIJaS5gY=;
 b=MiTz8ax2eQSsxsEFP7pjsKGm5snl9+M4kbETLKY++PjvXe39qMo2SSiEOHKw+qGIbP
 OmOkUN/D4YTzgPEbjGbKCm492eGhtinjK9WrpcLpVj7pDnmgx4gkPZJv/xq9QekZj86j
 6rGN3PYriMgoSZvvmmMYR8un3MTqcJHge/4gYwLrngcTCaKyqIlwcWEVnCUah3GcbIid
 n+lRRh5YI6D3Nam4X58u5fdRQq/7ZoOhYGSryouHIk9hY/TpH5kKVoZrQzJkQx6aCN5V
 Ok4AhxyGeoJhJPIcAILLrmP/hzVRgpgFTyar7ZiWuGH+3Su8lxe5XOjSm9d0XkvnrQr6
 CDiw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112;
 h=x-gm-message-state:sender:from:to:cc:subject:date:message-id
 :mime-version:content-transfer-encoding;
 bh=2blBOk/itWB/Ii7c/Hj/wYU868vN7WZqlClrIJaS5gY=;
 b=fIJs7O+JcW10jH46mOJBm800lgJmfvYu4BLx07Ks8l1SI1vjliRKra/yLJc+AdTP+x
 caCBNalo/o0P3EzxOY1j5CpKWWj2VrUmm5DZm6yYWtOXjBZUAkp5ZJ3uvr6unY2FuZeC
 XnPRFJYvIqGuAhYRp8TheQhiFnjzQtHIyKPseY7Yw7lDwwQQkOn2MuydHkl4orBQ29ZH
 jkIlEbzX7N8VxeFvyjh1yiTdzWWL6kEGuRB3WbgBDlKThydCcQrI7pIc6ddWTseL0ZbH
 0zDvbfNkfHiIK2a6MrDaNCzx0pbSt2Q058FJ1vGBZBcL+etUs1LiQufC4TdZWPEyqgFJ
 fDrw==
X-Gm-Message-State: AOAM532VwtZG1yqnNbUhOthgk/l+vTWpKqaMYoCt9Ijpgi6BxJ/GGiwt
 6xfAt6WG2TAr2itOJR+bV3OpPB70jS4=
X-Google-Smtp-Source: ABdhPJwJ+BQM9BT6DRm2PBd8WsYoE1zvIsnRIxMPkn7JPGPA/8nq4VYshnZlAFMizTafVOwp7uzrZg==
X-Received: by 2002:a17:906:9c90:b0:6df:9eea:cda3 with SMTP id
 fj16-20020a1709069c9000b006df9eeacda3mr19138195ejc.89.1647875800571; 
 Mon, 21 Mar 2022 08:16:40 -0700 (PDT)
Received: from lelap.local (catv-89-132-245-188.catv.fixed.vodafone.hu.
 [89.132.245.188]) by smtp.gmail.com with ESMTPSA id
 m20-20020a056402431400b00419315cc3e2sm2093021edc.61.2022.03.21.08.16.39
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 21 Mar 2022 08:16:39 -0700 (PDT)
From: Attila Lendvai <attila@lendvai.name>
Date: Mon, 21 Mar 2022 16:14:10 +0100
Message-Id: <20220321151410.21398-1-attila@lendvai.name>
X-Mailer: git-send-email 2.34.0
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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+larch=yhetil.org@gnu.org>
X-Migadu-Flow: FLOW_IN
X-Migadu-To: larch@yhetil.org
X-Migadu-Country: US
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1647875853;
	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=2blBOk/itWB/Ii7c/Hj/wYU868vN7WZqlClrIJaS5gY=;
	b=VK1EZBrVejgpo1ggH4ss047l2ADpQF65CL3IsQwuNm8P4TUCN7Dc2OSImtoNw1slLhJ5xW
	ukWftaYt2iLsWn05StK6b957wk8oXd5MJpB4tBzvlYaoS5z+dVdxd9016eL8OqBaOnAiNm
	GuCaxQJ9yNlK92Ijtj2yop+Yjuvp9CnAfDysKJA1gFdSkIap/RLEzGAaGdp6X539S7ofBl
	2n+6FtxhmU4A0El9P/AwOztEcBke5Xcs6ZbRTnpAIPqkDL/AS7p81GjXQjP5sQw/4F3NRC
	n8+v8WDBaal8EqoJT3EaeYlT5H9YUC0Svc5dWOfwajWIhSz/O+Txlf3Robf6zw==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647875853; a=rsa-sha256; cv=none;
	b=rCnfWk/pwpFDOEgC8ikN9ZqNb+rG4Ql5xmTfZVrWBiJE+bvqonfmzwOl0+wsiyjvV53m82
	S5kIMzhyjhVBbh0yJpxaQ5MXwU0fzwW/4SHog05Fub9LqemIKibyk0+yOWC6uYmjVZRRUt
	KnilaiQfKpu9Nc/YQEDXSgLhswvC9NtzKNlLNgU52hI5g58t61OZYNzft4IJqEsK1EZv5Q
	0Xq805Stemq7tr3bs83tB2yqARWI1uVS3kwkAAqcaNQO7h2shvRYpRPW7Jblagh01sQor7
	DVvdE1LzMmScgGZJuQ2clTyzN+KeXUGpnotiY+/PTWI8XV+eXmGUyCsa5wHpBQ==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=MiTz8ax2;
	dmarc=none;
	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"
X-Migadu-Spam-Score: 2.38
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=MiTz8ax2;
	dmarc=none;
	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"
X-Migadu-Queue-Id: 4B9A411CCB
X-Spam-Score: 2.38
X-Migadu-Scanner: scn1.migadu.com
X-TUID: ZzU7lqDAxtdR

This also updates shepherd-for-guix to the latest commit, so that the two
variants have a different version.

* gnu/packages/admin.scm (shepherd-for-guix): New variable.
---

v4: update to build the latest shepherd that now contains
the #:resource-limits commit.

 gnu/packages/admin.scm    | 49 +++++++++++++++++++++++++++++++++++++++
 gnu/services/shepherd.scm |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index c8f91aab0d..27fc33e990 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -307,6 +307,55 @@ (define-public shepherd
     (license license:gpl3+)
     (home-page "https://www.gnu.org/software/shepherd/")))
 
+;; This is the Shepherd package used by Guix.  This package variant
+;; allows us to add new features and fix bugs in Shepherd and use the
+;; new features in Guix, without having to go through the 'staging'
+;; branch, and without having to wait for a new release, see
+;; [TODO] in the manual.
+(define-public shepherd-for-guix
+  (let* ((version "0.8.1")
+         ;; If it's an unreleased commit:
+         (commit "3ee9a7193d73821d6f1dd76a745ed5e4bb1a78c8")
+         ;; Use the below form if it's a release, and also set REVISION to #f.
+         ;; (commit (string-append "v" version))
+         (revision "1"))
+    (package
+      (inherit shepherd)
+      (version (if revision
+                   (git-version version revision commit)
+                   version))
+      (source
+       (origin
+         (inherit (package-source shepherd))
+         (method git-fetch)
+         (uri (git-reference
+               ;; Build from git and add Autotools inputs, to make developing
+               ;; Shepherd easier. It enables easier package inheritance.
+               (url "https://git.savannah.gnu.org/git/shepherd.git/")
+               (commit commit)))
+         (snippet #f) ; TODO delete this once parent is refactored.
+         (sha256
+          (base32
+           "07zaazw33p98n38j9hgjaipjvbh9mf0x3b5nbri5nyrxbgn0vvvb"))))
+      ;; TODO merge this back into the parent with a patch to staging.
+      (arguments
+       (append
+        (package-arguments shepherd)
+        '(#:phases
+          (modify-phases %standard-phases
+            (delete 'strip) ; Avoid some warnings from stripping .go files.
+            (add-after 'unpack 'patch-source
+              (lambda _
+                ;; Build with -O1 to work around <https://bugs.gnu.org/48368>.
+                (substitute* "Makefile.am"
+                  (("compile --target")
+                   "compile -O1 --target"))))))))
+      (native-inputs
+       (modify-inputs (package-native-inputs shepherd)
+         (prepend autoconf automake gettext-minimal help2man texinfo)))
+      (description "A package variant for use in Guix. It helps lowering
+the build time of Guix when working on Shepherd."))))
+
 (define-public guile2.2-shepherd
   (package
     (inherit shepherd)
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index b44dbf9d9f..991194ffe6 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -88,7 +88,7 @@ (define-record-type* <shepherd-configuration>
   shepherd-configuration make-shepherd-configuration
   shepherd-configuration?
   (shepherd shepherd-configuration-shepherd
-            (default shepherd)) ; file-like
+            (default shepherd-for-guix)) ; file-like
   (services shepherd-configuration-services
             (default '()))) ; list of <shepherd-service>
 
-- 
2.34.0