GNU bug report logs - #54207
[PATCH] gnu: shepherd: Convert to build from git instead of a release.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 54207 in the body.
You can then email your comments to 54207 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Attila Lendvai <attila <at> lendvai.name>
To: guix-patches <at> gnu.org
Cc: Attila Lendvai <attila <at> lendvai.name>
Subject: [PATCH] gnu: shepherd: Convert to build from git instead of a release.
Date: Tue,  1 Mar 2022 09:59:13 +0100

This increases the flexibility to inherit from this package, and use a
non-yet-released version of Shepherd in a Guix build while working on
Shepherd.
---
 gnu/packages/admin.scm | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index c8f91aab0d..59a37c5ace 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -270,26 +270,33 @@ (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))))
+       (sha256
+        (base32
+         "109ha9rk4ycqcmx9cddlbym92c3fvbwp12q9p42h8sg8vr367w5j"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Build with -O1 to work around <https://bugs.gnu.org/48368>.
+           (substitute* "Makefile.am"
+             (("compile --target")
+              "compile -O1 --target"))))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--localstatedir=/var")
        #:make-flags '("GUILE_AUTO_COMPILE=0")))
     (native-inputs
-     (list pkg-config
+     (list autoconf
+           automake
+           gettext-minimal
+           help2man
+           pkg-config
+           texinfo
            ;; This is the Guile we use as a cross-compiler...
            guile-3.0))
     (inputs
-- 
2.34.0

Message #8 received at 54207 <at> debbugs.gnu.org (full text, mbox):

From: Attila Lendvai <attila <at> lendvai.name>
To: "54207 <at> debbugs.gnu.org" <54207 <at> debbugs.gnu.org>
Subject: (No Subject)
Date: Tue, 01 Mar 2022 09:09:26 +0000

i forgot to check this:

$ ./pre-inst-env guix refresh --list-dependent shepherd | tr " " "\n" | wc -l
1349

i.e. this should go into staging.

--
• attila lendvai
• PGP: 963F 5D5F 45C7 DFCD 0A39
--
“Not all men want to dominate a large number of other persons, but those who do affect the life of many.”
	— Silvano Arieti (1914–1981)

Message #11 received at 54207 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: Attila Lendvai <attila <at> lendvai.name>, 54207 <at> debbugs.gnu.org
Subject: Re: [bug#54207] [PATCH] gnu: shepherd: Convert to build from git
 instead of a release.
Date: Tue, 01 Mar 2022 11:18:59 +0100

[Message part 1 (text/plain, inline)]

Attila Lendvai schreef op di 01-03-2022 om 09:59 [+0100]:
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://git.savannah.gnu.org/git/shepherd.git/")
> +             (commit (string-append "v" version))))

Perhaps add a comment about why it a git origin is used
and autoconf & friends are in native-inputs?

  ;; Build from git and add Autotools inputs, to make developing
  ;; the shepherd easier

Also, to avoid having to go through staging for adding a feature
to the shepherd to use in Guix, WDYT of defining a package variant
of shepherd for use in Guix, and modifying the default Guix in
'shepherd-configuration' appropriately?

(define-public shepherd-for-guix
  (let ((commit ...)
        (revision ...))
    (package
      (inherit shepherd)
      (source [the git origin])
      (version (git-version ...))
      (native-inputs
        (modify-inputs (package-inputs shepherd)
          (prepend [autotools packages])))
      (description [a package variant for use in Guix]))))

Greetings,
Maxime.

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 54207-close <at> debbugs.gnu.org (full text, mbox):

From: Attila Lendvai <attila <at> lendvai.name>
To: "54207-close <at> debbugs.gnu.org" <54207-close <at> debbugs.gnu.org>
Subject: (No Subject)
Date: Tue, 01 Mar 2022 18:49:25 +0000

closing this, because i've accidentall sent the suggested solution as a separate issue:

https://issues.guix.gnu.org/54216

--
• attila lendvai
• PGP: 963F 5D5F 45C7 DFCD 0A39
--
“What's done to children, they will do to society.”
	— Karl A. Menninger (http://psychohistory.com/)

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.