bug#54207: closed ([PATCH] gnu: shepherd: Convert to build from git instead of a release.)

[GNU bug Tracking System]

Your message dated Tue, 01 Mar 2022 18:49:25 +0000
with message-id 
<KoFUF9Wi4wtBjPA5ZdFXFUXchTQaQcDtEVZ-bBOTjU627iXeao1bC5aRQ3v3MvB4BQ8H-G4uLbTCZ9z9fP2cjJlE13Vbdrx78TcFVOj07PM=@lendvai.name>
and subject line (No Subject)
has caused the debbugs.gnu.org bug report #54207,
regarding [PATCH] gnu: shepherd: Convert to build from git instead of a release.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
54207: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=54207
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> 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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> 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/)
>
>
>
> --- End Message ---