From patchwork Tue Mar 1 18:45:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 37572 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 F099727BBEA; Tue, 1 Mar 2022 18:47:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7CDB827BBE9 for ; Tue, 1 Mar 2022 18:47:48 +0000 (GMT) Received: from localhost ([::1]:51022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nP7XG-0007Ui-Sb for patchwork@mira.cbaines.net; Tue, 01 Mar 2022 13:47:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nP7WY-0007UV-UU for guix-patches@gnu.org; Tue, 01 Mar 2022 13:47:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44329) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nP7WY-0002RM-DR for guix-patches@gnu.org; Tue, 01 Mar 2022 13:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nP7WY-00059I-6t for guix-patches@gnu.org; Tue, 01 Mar 2022 13:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54216] [PATCH v2] 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 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Mar 2022 18:47:02 +0000 Resent-Message-ID: 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 Received: via spool by 54216-submit@debbugs.gnu.org id=B54216.164616039419754 (code B ref 54216); Tue, 01 Mar 2022 18:47:02 +0000 Received: (at 54216) by debbugs.gnu.org; 1 Mar 2022 18:46:34 +0000 Received: from localhost ([127.0.0.1]:38226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nP7W6-00058Y-71 for submit@debbugs.gnu.org; Tue, 01 Mar 2022 13:46:34 -0500 Received: from mail-wr1-f44.google.com ([209.85.221.44]:38835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nP7W4-00058L-3J for 54216@debbugs.gnu.org; Tue, 01 Mar 2022 13:46:32 -0500 Received: by mail-wr1-f44.google.com with SMTP id t11so962857wrm.5 for <54216@debbugs.gnu.org>; Tue, 01 Mar 2022 10:46:31 -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=6tTgkj7PeFvN6gJCgdjOZABdX5Mxxt59FdsBMmNwAbE=; b=NngXnOoxUxlSsPC45V43imbg/yTge0yJa+VaxGTGjIufyS3c7IS+TGBZNnTgazvKEx qj+kNvzfk1WgqKSfnrVOmvf6Qz31K1kuazv/6x+9S+XeVIXpoFPQ2xNjSVatvq612LEY CxnaiYBjhuz90NJT2JV6yAvDt1GEFQ1Me02AhFbp9Wx9cDzKsqGC13TpX+uSKttwb50W PH42HFIm4nSAA80/+rsr2OdQUANAOg1e9NiVXrwQJEjWeRpf5ViwdKfxKWwOMUXFCKgu We7Eq6bTpugPL+SrZZwG/x/ehubmMrC7JMTl326YHQFUCcNr1CAdbFMWuKRvdE1Fm6Oh APyw== 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=6tTgkj7PeFvN6gJCgdjOZABdX5Mxxt59FdsBMmNwAbE=; b=WnXBgk2kdv4bHfhayvLpm4fwjOoycb0H5JxojnjhyiNSNuJgIxplBp62tmzKNeclve ImV8tbtlnbxwc/8Mn5JNsxrYXAPD0n6VBGL9sIjafksFiIVOHaDUjInJezaoLlCYJYTN PLFXl5ZqEg9aEBd5RsbRLKBk5LZonlyCsU+1KKWaARaN/Xh9FyUYC6W5118idrWptlsD 63rD7SibjXjb4/ValFE7HZLu2eTqUMtsqLw9tnVr1cYDzowhz5z89GHYNrEMFFqAxfMK LCOHq5Lxyt4RYY8t2o0/5Hqgy7It1Op1Vfj9jclePuJVKWyoa8/QdKHo+qqdbhFX26ni XPyg== X-Gm-Message-State: AOAM532GOhO4Hia2RonuHGxN3HMZvF0/LOUR45phwcTkGdEhbJ7VN0vG h4vFX3E73Zy065Khykb9TCvl4Ii7R7Y= X-Google-Smtp-Source: ABdhPJx8XiVfrqJ1lBkpNedi/a8pajEeV34t2UO186OL7loOS/gjxLCN1St1k86xjRcWGtBWxFbu8w== X-Received: by 2002:adf:a150:0:b0:1ee:72f9:7c07 with SMTP id r16-20020adfa150000000b001ee72f97c07mr19573830wrr.674.1646160386108; Tue, 01 Mar 2022 10:46:26 -0800 (PST) Received: from localhost.localdomain ([2a02:ab88:3710:7c80:9130:5abf:96b3:dc0c]) by smtp.gmail.com with ESMTPSA id z5-20020a05600c0a0500b0037bb8df81a2sm4276047wmp.13.2022.03.01.10.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Mar 2022 10:46:25 -0800 (PST) From: Attila Lendvai Date: Tue, 1 Mar 2022 19:45:18 +0100 Message-Id: <20220301184517.13439-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 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 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. --- v2: add the recommended comment and some edits to the other comments. gnu/packages/admin.scm | 41 +++++++++++++++++++++++++++++++++++++++ gnu/services/shepherd.scm | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c8f91aab0d..f43526b7d9 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -307,6 +307,47 @@ (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 "7c380590164ea8ee40de46059d07e08a48963577") + ;; 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) + (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