From: Attila Lendvai <attila@lendvai.name>
To: 54216@debbugs.gnu.org
Cc: Attila Lendvai <attila@lendvai.name>
Subject: [bug#54216] [PATCH v4] gnu: shepherd-for-guix: New package for use in Guix.
Date: Mon, 21 Mar 2022 16:14:10 +0100 [thread overview]
Message-ID: <20220321151410.21398-1-attila@lendvai.name> (raw)
In-Reply-To: <20220301182848.26694-1-attila@lendvai.name>
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
next prev parent reply other threads:[~2022-03-21 15:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 18:28 [bug#54216] [PATCH] gnu: shepherd-for-guix: New package for use in Guix Attila Lendvai
2022-03-01 18:36 ` Maxime Devos
2022-03-01 18:45 ` [bug#54216] [PATCH v2] " Attila Lendvai
2022-03-01 19:01 ` Maxime Devos
2022-03-01 19:27 ` Attila Lendvai
2022-03-02 9:14 ` zimoun
2022-03-02 23:50 ` Leo Famulari
2022-03-03 6:25 ` Maxime Devos
2022-03-03 8:48 ` zimoun
2022-03-05 21:13 ` Leo Famulari
2022-03-05 21:50 ` Maxime Devos
2022-03-03 14:36 ` [bug#54216] [PATCH staging] gnu: shepherd: Build it from git, and clean up shepherd-for-guix Maxime Devos
2022-03-03 14:51 ` zimoun
2022-03-03 9:43 ` [bug#54216] [PATCH v3] gnu: shepherd-for-guix: New package for use in Guix Attila Lendvai
2022-03-03 14:28 ` [bug#54216] [PATCH staging] gnu: shepherd: Build it from git, and clean up shepherd-for-guix Attila Lendvai
2022-03-04 10:30 ` [bug#54216] [PATCH shepherd staging v2] " Attila Lendvai
2022-03-21 15:14 ` Attila Lendvai [this message]
2022-03-21 15:41 ` [bug#54216] [PATCH] gnu: shepherd-for-guix: New package for use in Guix Ludovic Courtès
2022-03-21 16:12 ` zimoun
2022-03-21 17:07 ` [bug#54216] [PATCH staging v3] gnu: shepherd: Build it from git, and clean up shepherd-for-guix Attila Lendvai
2022-03-22 9:27 ` Attila Lendvai
2022-03-22 13:48 ` Attila Lendvai
2022-03-22 14:42 ` pelzflorian (Florian Pelz)
2022-03-28 9:07 ` Attila Lendvai
2022-05-01 14:31 ` [bug#54216] [PATCH v4] gnu: shepherd: Build Shepherd 0.9.0 from git Attila Lendvai
2022-09-26 19:11 ` [bug#54216] [PATCH v5] gnu: shepherd: Build Shepherd 0.9.2 " Attila Lendvai
2022-09-26 21:44 ` [bug#54216] [PATCH v6] " Attila Lendvai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220321151410.21398-1-attila@lendvai.name \
--to=attila@lendvai.name \
--cc=54216@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).