[bug#27657] [PATCH] gnu: graphviz: Update to 2.40.1.

[Marius Bakke]

Arun Isaac <address@hidden> writes:

> * gnu/packages/graphviz.scm (graphviz): Update to 2.40.1.
> [arguments]: Remove pre-build phase.
> ---
>  gnu/packages/graphviz.scm | 54 
> +++++++++++++++++++----------------------------
>  1 file changed, 22 insertions(+), 32 deletions(-)
>
> diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
> index d47d45e52..99ba4e887 100644
> --- a/gnu/packages/graphviz.scm
> +++ b/gnu/packages/graphviz.scm
> @@ -44,7 +44,7 @@
>  (define-public graphviz
>    (package
>      (name "graphviz")
> -    (version "2.38.0")
> +    (version "2.40.1")
>      (source (origin
>               (method url-fetch)
>               (uri (string-append
> @@ -52,43 +52,33 @@
>                     version ".tar.gz"))
>               (sha256
>                (base32
> -               "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"))))
> +               "08d4ygkxz2f553bxj6087da56a23kx1khv0j8ycxa102vvx1hlna"))))
>      (build-system gnu-build-system)
>      (arguments
>       ;; FIXME: rtest/rtest.sh is a ksh script (!).  Add ksh as an input.
>       '(#:tests? #f
> -
> -       #:phases (alist-cons-before
> -                 'build 'pre-build
> -                 (lambda _
> -                   ;; Work around bogus makefile when using an external
> -                   ;; libltdl.  Failing to do so, one hits this error:
> -                   ;; "No rule to make target `-lltdl', needed by 
> `libgvc.la'."
> -                   (substitute* "lib/gvc/Makefile"
> -                     (("am__append_5 *=.*")
> -                      "am_append_5 =\n")))
> +       #:phases (alist-cons-after
> +                 'install 'move-docs
> +                 (lambda* (#:key outputs #:allow-other-keys)
> +                   (let ((out (assoc-ref outputs "out"))
> +                         (doc (assoc-ref outputs "doc")))
> +                     (mkdir-p (string-append doc "/share/graphviz"))
> +                     (rename-file (string-append out "/share/graphviz/doc")
> +                                  (string-append doc "/share/graphviz/doc"))
> +                     #t))
>                   (alist-cons-after
> -                  'install 'move-docs
> +                  'move-docs 'move-guile-bindings
>                    (lambda* (#:key outputs #:allow-other-keys)
> -                           (let ((out (assoc-ref outputs "out"))
> -                                 (doc (assoc-ref outputs "doc")))
> -                             (mkdir-p (string-append doc "/share/graphviz"))
> -                             (rename-file (string-append out 
> "/share/graphviz/doc")
> -                                          (string-append doc 
> "/share/graphviz/doc"))
> -                             #t))
> -                  (alist-cons-after
> -                   'move-docs 'move-guile-bindings
> -                   (lambda* (#:key outputs #:allow-other-keys)
> -                     (let* ((out (assoc-ref outputs "out"))
> -                            (lib (string-append out "/lib"))
> -                            (extdir (string-append lib
> -                                                   "/guile/2.0/extensions")))
> -                       (mkdir-p extdir)
> -                       (rename-file (string-append
> -                                     lib "/graphviz/guile/libgv_guile.so")
> -                                    (string-append extdir
> -                                                   "/libgv_guile.so"))))
> -                   %standard-phases)))))
> +                    (let* ((out (assoc-ref outputs "out"))
> +                           (lib (string-append out "/lib"))
> +                           (extdir (string-append lib
> +                                                  "/guile/2.0/extensions")))
> +                      (mkdir-p extdir)
> +                      (rename-file (string-append
> +                                    lib "/graphviz/guile/libgv_guile.so")
> +                                   (string-append extdir
> +                                                  "/libgv_guile.so"))))
> +                  %standard-phases))))

Ugh. Could you try to convert this to use 'modify-phases' syntax first?
Please do so in a separate commit since it's a non-trivial change on its
own. It will make it much clearer what's going on in this patch.

Otherwise this LGTM. Note that we now have at least one 'ksh'
implementation[0], if you feel like fiddling with the tests ;-)

[0] 
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=cc5a76a74c5042a3dff894cdd64ad0399ffd963c

signature.asc
Description: PGP signature