From: Attila Lendvai <attila@lendvai.name>
To: 54216@debbugs.gnu.org
Cc: Attila Lendvai <attila@lendvai.name>
Subject: [bug#54216] [PATCH shepherd staging v2] gnu: shepherd: Build it from git, and clean up shepherd-for-guix.
Date: Fri, 4 Mar 2022 11:30:29 +0100 [thread overview]
Message-ID: <20220304103028.24388-1-attila@lendvai.name> (raw)
In-Reply-To: <20220301182848.26694-1-attila@lendvai.name>
* gnu/packages/admin.scm (shepherd): Change SOURCE to point to the git repository.
(shepherd-for-guix): Simplify by moving most of the customizations into the above.
---
i accidentally used the wrong hash in the first version. v2 fixes it, and
also adds a more conformant commit message.
my server is now building/reconfiguring into this codebase, that's how i've
noticed my mistake. no idea why it didn't surface earlier, probably due
to an unfortunate ordering of the test builds and the copy-paste mistake.
gnu/packages/admin.scm | 70 +++++++++++++++++-------------------------
1 file changed, 28 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index dbceaca5e5..882dc9f121 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -270,26 +270,31 @@ (define-public shepherd
(package
(name "shepherd")
(version "0.8.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/shepherd/shepherd-"
- version ".tar.gz"))
- (sha256
- (base32
- "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Build with -O1 to work around <https://bugs.gnu.org/48368>.
- (substitute* "Makefile.in"
- (("compile --target")
- "compile -O1 --target"))))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/shepherd.git/")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "109ha9rk4ycqcmx9cddlbym92c3fvbwp12q9p42h8sg8vr367w5j"))
+ (modules '((guix build utils)))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--localstatedir=/var")
- #:make-flags '("GUILE_AUTO_COMPILE=0")))
+ #:make-flags '("GUILE_AUTO_COMPILE=0")
+ #:phases
+ (modify-phases %standard-phases
+ ;; TODO delete this once Guile is updated to v3.0.8+
+ (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
- (list pkg-config
+ (list autoconf automake gettext-minimal help2man texinfo pkg-config
;; This is the Guile we use as a cross-compiler...
guile-3.0))
(inputs
@@ -314,45 +319,26 @@ (define-public shepherd
;; [TODO] in the manual.
(define-public shepherd-for-guix
(let* ((version "0.8.1")
- ;; If it's an unreleased commit:
+ ;; A commit string, or #f if it's a release.
(commit "7c380590164ea8ee40de46059d07e08a48963577")
- ;; Use the below form if it's a release, and also set REVISION to #f.
- ;; (commit (string-append "v" version))
- (revision "1"))
+ (revision "1") ; Only relevant when COMMIT is specified.
+ (git-ref (or commit (string-append "v" version))))
(package
(inherit shepherd)
- (version (if revision
+ (version (if commit
(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.
+ (commit git-ref)))
(sha256
- (base32
- "1hgkbl3fyzwi5vw63kbkswnf3viyfl52c5dzkx7vbkr4sj5ysz1g"))))
- ;; TODO merge this back into the parent with a patch to staging.
- (arguments
- (append
- (package-arguments shepherd)
- '(#:phases
- (modify-phases %standard-phases
- (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
+ (base32 "1hgkbl3fyzwi5vw63kbkswnf3viyfl52c5dzkx7vbkr4sj5ysz1g"))))
+ (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
--
2.34.0
next prev parent reply other threads:[~2022-03-04 11:37 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 ` Attila Lendvai [this message]
2022-03-21 15:14 ` [bug#54216] [PATCH v4] gnu: shepherd-for-guix: New package for use in Guix Attila Lendvai
2022-03-21 15:41 ` [bug#54216] [PATCH] " 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=20220304103028.24388-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).