From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IAD7AoNmHmLJawAAgWs5BA (envelope-from ) for ; Tue, 01 Mar 2022 19:31:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6AhBN4JmHmInqwAAG6o9tA (envelope-from ) for ; Tue, 01 Mar 2022 19:31:30 +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 89999125FB for ; Tue, 1 Mar 2022 19:31:30 +0100 (CET) Received: from localhost ([::1]:45948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nP7HV-00039L-Ib for larch@yhetil.org; Tue, 01 Mar 2022 13:31:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nP7H4-00035G-Lq for guix-patches@gnu.org; Tue, 01 Mar 2022 13:31:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nP7H4-0006sg-Cl for guix-patches@gnu.org; Tue, 01 Mar 2022 13:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nP7H4-0004iS-4E for guix-patches@gnu.org; Tue, 01 Mar 2022 13:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54216] [PATCH] gnu: shepherd-for-guix: New package for use in Guix. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Mar 2022 18:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54216 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54216@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164615944218101 (code B ref -1); Tue, 01 Mar 2022 18:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Mar 2022 18:30:42 +0000 Received: from localhost ([127.0.0.1]:38183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nP7Gj-0004hs-ST for submit@debbugs.gnu.org; Tue, 01 Mar 2022 13:30:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:36008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nP7Gi-0004hl-F6 for submit@debbugs.gnu.org; Tue, 01 Mar 2022 13:30:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nP7Gi-0002na-8W for guix-patches@gnu.org; Tue, 01 Mar 2022 13:30:40 -0500 Received: from [2a00:1450:4864:20::429] (port=42956 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nP7Gg-0006St-4A for guix-patches@gnu.org; Tue, 01 Mar 2022 13:30:39 -0500 Received: by mail-wr1-x429.google.com with SMTP id d17so21869436wrc.9 for ; Tue, 01 Mar 2022 10:30:36 -0800 (PST) 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=+XGDEfWWkuC50EQZehiHj0D7uwfFZm55Ci4V/HLmztE=; b=lJsfEIqzDWjTMPvIiQTXyJyzgfEFkK6aq3d2hEBlrJ1pPZjgpE+RTHNYiJvm4giPNZ k1+R5f3rwIpL2SOROdeQ48twnf42+ApuOJLmazOv3ZQKCNa2sbIBw/eRXhOrnPxbDZS+ U9/2MpYCm1NCz+Q3EOXhOS9foOOaIvO61ndeun8zL8tVD6gS4XTAXiYdoZZl+Ho0L5vX 99kI+Ai//IEuTzAL0XBwH2+bwYwsPqGOT3X3R3OxvN3mWuXv87FTFh57kcJ23PfUsmcb 0Few2WlQISIMszQhagAY75UedpKRjMM8wwCibN8vRR1ll5A5BeH5qlJuNgA0Xnw+RkiW wTag== 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=+XGDEfWWkuC50EQZehiHj0D7uwfFZm55Ci4V/HLmztE=; b=r8ILzfZ+2fgiDU+/iBSD6n3POkqml/aN8ju4SDldibYnqa05FSO/caqhYtM0GUwKfK CgruFFFYCvO2Zx49LmhfywuWohffqLbbJT13YWmf+QBbFJxxrS+mVa+UbZ0ipZQ2yq+l 61X1eGv3hLb6zVd2Zo/LCGUAz4Dx8Tm97FeOf5usFwHWf+gl0zO/F+rF26+SPUsXho7o CzsKXDq6Ydb/UZOAI9O5SjQfda6u7yxICjEQbt6fpyvUnk8O9zNGMMrOx28OI9A+9xbX 0VMdr/LFq+M7sg8M53o/uSkaBFBVibhsrZKkJeUdc8n8yr0n9k0A4P66/mPkDOQLmzsl dQrQ== X-Gm-Message-State: AOAM5319VsVnfTMZ/ceTrBGZYiiamA122rmCNoKjSMotrIisorse7seV lodBK79fUXXbzA0VZEHQyJFWiI0/0hA= X-Google-Smtp-Source: ABdhPJzUlUt6sbGniJogJbDHfosSXKxCfh5UUWWscz4NZvwCcSFQiF4wezFtewQPuXvg6P5VbqrWcQ== X-Received: by 2002:a5d:568d:0:b0:1ed:e3d4:580a with SMTP id f13-20020a5d568d000000b001ede3d4580amr20477046wrv.391.1646159434902; Tue, 01 Mar 2022 10:30:34 -0800 (PST) Received: from localhost.localdomain ([2a02:ab88:3710:7c80:9130:5abf:96b3:dc0c]) by smtp.gmail.com with ESMTPSA id j6-20020adfe506000000b001f00d7c38e8sm2874831wrm.93.2022.03.01.10.30.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Mar 2022 10:30:34 -0800 (PST) From: Attila Lendvai Date: Tue, 1 Mar 2022 19:28:49 +0100 Message-Id: <20220301182848.26694-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=attila.lendvai@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1646159490; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=+XGDEfWWkuC50EQZehiHj0D7uwfFZm55Ci4V/HLmztE=; b=j04gr+9ghyiOwEqUlQF29J4AJjXnW3pe67aMjtbtPKGhWfXvAwHTUVBPg+c74r5IJvcevH r4ur25wx+JQt1OUZ6nYLlLiS4VZ2ITvZ+hwoWtiDCOXJeHIQa2/2s1SNZM89jxMbtINGOQ OditidJzUY8PtD3cK0wjbMLm6wI5Ab//MWl4q6jtse4X3FI56N8iv1D1v5J5nqJd4CrBGg ARBrutJ2QJgg2VbHXPcDGKIXNz6T2ltt6cCF6qpMToR8p1mTJh9d1fKZbQoul/LJImLl4o ZGS+FIfM7xFxR4dkOJ+pbkI0QwgjILH1LNxZZUPXDvdpVf9wrSsUvooBgPEBPQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646159490; a=rsa-sha256; cv=none; b=o0ajS+fmnB5gTaXDvHxZ9i1RXQfX6KQgigOO0gtMjnbkNYkh9NgRR7FxrakvPOo7l4Suj1 NP5y4Od29QFZ0kbQSfgB4zq13U1Xc7N+jWZldO3xWiJSKExDboIx5dV2sIo8nu+QKFM/Sk BnA4JUU0qPcVdtQdBVMt17f5NruCu9OKV+LZ7+PiJMhk870Vp2YRU1ovtJNMTYc57rgSbM RyuzYr5emnGsaOZRmenD9BYvXe6+QhbFcEa0vKcjwHHXcctr6ftFO2SsUmfSVPRK3gJZIi H0x+5yhVm92O4KLaCcQnQsyFxlQamhBk178YO8l7CSCKB/XNSab+93oqHOkgBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=lJsfEIqz; 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.12 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=lJsfEIqz; 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: 89999125FB X-Spam-Score: 2.12 X-Migadu-Scanner: scn1.migadu.com X-TUID: 09Toy7Dn7qy7 This increases the flexibility to inherit from this package, and to use a non-yet-released version of Shepherd in a Guix build while working on Shepherd. IOW, it makes it easier to update Shepherd without going through staging and/or rebuilding several dependant packages. This also updates Shepherd to the latest commit, so that the two variants have a different version. * gnu/packages/admin.scm (shepherd-for-guix): New variable. --- once it's merged, i'll send another patch to staging that will simplify this. gnu/packages/admin.scm | 36 ++++++++++++++++++++++++++++++++++++ gnu/services/shepherd.scm | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c8f91aab0d..3c02b16f34 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -307,6 +307,42 @@ (define-public shepherd (license license:gpl3+) (home-page "https://www.gnu.org/software/shepherd/"))) +(define-public shepherd-for-guix + (let* ((version "0.8.1") + ;; If it's an unreleased commit: + (commit "7c380590164ea8ee40de46059d07e08a48963577") + ;; Use the below if it's a release, and set REVISION to #f. + ;; (commit (string-append "v" version)) + (revision "1")) + (package + (inherit shepherd) + (source + (origin + (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))) + (sha256 + (base32 + "1hgkbl3fyzwi5vw63kbkswnf3viyfl52c5dzkx7vbkr4sj5ysz1g")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Build with -O1 to work around . + (substitute* "Makefile.am" + (("compile --target") + "compile -O1 --target")))))) + (version (if revision + (git-version version revision commit) + version)) + (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 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 -- 2.34.0