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

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

[Arun Isaac]

* 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))))
     (inputs
      `(("libXrender" ,libxrender)
        ("libX11" ,libx11)
-- 
2.12.2

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

[Arun Isaac]

The source tarball URL shown on the graphviz download page (
http://www.graphviz.org/Download_source.php ) is
http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz

Currently, our graphviz package is using
http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.40.1.tar.gz

Both appear to be the same tarball. I don't know why they have two
copies on the server. Should we change the source URL of our package?

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

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 4585 bytes --]

Arun Isaac <arunisaac@systemreboot.net> 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

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

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 839 bytes --]

Arun,

On 11/07/17 23:34, Arun Isaac wrote:
> Both appear to be the same tarball. I don't know why they have two
> copies on the server. Should we change the source URL of our package?

In general, dual-directory schemes like this — anything involving
‘current’ vs. ‘archive’ — often suggest that the project intends to
periodically prune the former.

For example, they might keep only the latest release of a series and
move the rest to an ‘archive’ directory. Therefore, it's common to use
the latter directly, or hedge our bets by trying both.
The ‘sudo’ package is a good example of this.

In this case, as you've no doubt already noticed, both directories are
identical. I'd say: before changing anything, ask upstream why they do
this and which URI we should prefer.

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 504 bytes --]

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

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 812 bytes --]

Arun Isaac <arunisaac@systemreboot.net> writes:

> The source tarball URL shown on the graphviz download page (
> http://www.graphviz.org/Download_source.php ) is
> http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz
>
> Currently, our graphviz package is using
> http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.40.1.tar.gz
>
> Both appear to be the same tarball. I don't know why they have two
> copies on the server. Should we change the source URL of our package?

They appear have identical contents too:

http://www.graphviz.org/pub/graphviz/stable/SOURCES/
http://www.graphviz.org/pub/graphviz/ARCHIVE/

..and both return HTTP 200.

I guess we can 'proactively' add both, but I have a slight preference
for sticking with 'what works' until we know which one to use. YMMV :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

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

[Ludovic Courtès]

Marius Bakke <mbakke@fastmail.com> skribis:

> Arun Isaac <arunisaac@systemreboot.net> 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 ;-)

LGTM too, especially if it’s not as big as the current Graphviz.

I’m fine with you switch to ‘modify-phases’ after this patch too.

With 970 dependents, this should go to a new ‘staging’ branch to be
merged after ‘core-updates’ is merged.  Fine with you?

Thanks,
Ludo’.

[bug#27657] [PATCH 1/3] gnu: graphviz: Use modify-phases.

[Arun Isaac]

* gnu/packages/graphviz.scm (graphviz): Re-indent.
[arguments]: Use modify-phases instead of alist-cons-before and
alist-cons-after.
---
 gnu/packages/graphviz.scm | 77 +++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index d47d45e52..f236788e0 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -46,49 +46,48 @@
     (name "graphviz")
     (version "2.38.0")
     (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-"
-                   version ".tar.gz"))
-             (sha256
-              (base32
-               "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"))))
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"))))
     (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")))
-                 (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
-                   '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)))))
+       #:phases
+       (modify-phases %standard-phases
+         (add-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"))))
+         (add-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)))
+         (add-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"))))))))
     (inputs
      `(("libXrender" ,libxrender)
        ("libX11" ,libx11)
-- 
2.12.2

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

[Arun Isaac]

Marius Bakke writes:

> I have a slight preference for sticking with 'what works' until we
> know which one to use. YMMV :-)

I agree with Tobias and you on this one. Let's not change the URL.

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

[Arun Isaac]

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

I tried loksh, but it seems to be missing ksh93 features required by the
tests. I also packaged mksh, and tried that, but that too is missing
required ksh93 features. Perhaps, only the original AT&T korn shell has
the ksh93 features. But, I am unable to find the source code for it.

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

[Arun Isaac]

Ludovic Courtès writes:

> With 970 dependents, this should go to a new ‘staging’ branch to be
> merged after ‘core-updates’ is merged.  Fine with you?

Are you asking me? If so, yes, I am fine with it.

[bug#27657] [PATCH 1/3] gnu: graphviz: Use modify-phases.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 3830 bytes --]

Arun Isaac <arunisaac@systemreboot.net> writes:

> * gnu/packages/graphviz.scm (graphviz): Re-indent.
> [arguments]: Use modify-phases instead of alist-cons-before and
> alist-cons-after.

Thanks!

[...]

> -       #: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")))
> -                 (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
> -                   '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)))))
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-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"))))
> +         (add-after
> +             'install 'move-docs

Maybe change this to current conventions while at it?

> +           (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)))
> +         (add-after
> +             'move-docs 'move-guile-bindings

And this.

> +           (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"))))))))

Similarly, (rename-file ...) has an unspecified return value, so please
add a #t at the end of this phase (even though it wasn't before). LGTM!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

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

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

> Ludovic Courtès writes:
>
>> With 970 dependents, this should go to a new ‘staging’ branch to be
>> merged after ‘core-updates’ is merged.  Fine with you?
>
> Are you asking me? If so, yes, I am fine with it.

Yes I was asking you.  :-)

Thanks,
Ludo’.

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

[Arun Isaac]

> With 970 dependents, this should go to a new ‘staging’ branch to be
> merged after ‘core-updates’ is merged.  Fine with you?

I've made the changes suggested by Marius Bakke and pushed to a new
staging branch.

However, there is more about the graphviz package:

Several of the inputs don't seem to be required. graphviz builds
successfully and without any change of features (as reported by the
configure phase) when built without those inputs.

Also, I think the swig input should actually be a native input.

I'll shortly send a patch with these changes. Do review and offer
feedback.

Thanks.

[bug#27657] [PATCH] gnu: graphviz: Remove unnecessary inputs.

[Arun Isaac]

* gnu/packages/graphviz.scm (graphviz)[inputs]: Remove libxrender, libx11,
libxaw, expat, libjpeg, libpng.
Move guile and swig to native-inputs.
[native-inputs]: Remove bison.
---
 gnu/packages/graphviz.scm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 6724ba6d7..c758a63b2 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -80,23 +80,17 @@
                                            "/libgv_guile.so"))
                #t))))))
     (inputs
-     `(("libXrender" ,libxrender)
-       ("libX11" ,libx11)
-       ("gts" ,gts)
+     `(("gts" ,gts)
        ("gd" ,gd)                                 ; FIXME: Our GD is too old
-       ("guile" ,guile-2.0)                       ;Guile bindings
-       ("swig" ,swig)
        ("pango" ,pango)
        ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
        ("libltdl" ,libltdl)
-       ("libXaw" ,libxaw)
-       ("expat" ,expat)
-       ("libjpeg" ,libjpeg)
-       ("libpng" ,libpng)))
+       ("libXaw" ,libxaw)))
     (native-inputs
-     `(("bison" ,bison)
-       ("pkg-config" ,pkg-config)))
+     `(("guile" ,guile-2.0)                       ;Guile bindings
+       ("pkg-config" ,pkg-config)
+       ("swig" ,swig)))
     (outputs '("out" "doc"))                      ; 5 MiB of html + pdfs
     (home-page "http://www.graphviz.org/")
     (synopsis "Graph visualization software")
-- 
2.12.2

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

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

On Fri, Jul 14, 2017 at 04:45:25PM +0530, Arun Isaac wrote:
> 
> > With 970 dependents, this should go to a new ‘staging’ branch to be
> > merged after ‘core-updates’ is merged.  Fine with you?
> 
> I've made the changes suggested by Marius Bakke and pushed to a new
> staging branch.
> 
> However, there is more about the graphviz package:
> 
> Several of the inputs don't seem to be required. graphviz builds
> successfully and without any change of features (as reported by the
> configure phase) when built without those inputs.
> 
> Also, I think the swig input should actually be a native input.
> 
> I'll shortly send a patch with these changes. Do review and offer
> feedback.

Did you compare our package to the Graphviz project's annotated list of
dependencies, found in the link below?

http://www.graphviz.org/Download_source.php

Some of the removed dependencies seem to have a use in graphviz.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Arun Isaac]

>> Several of the inputs don't seem to be required. graphviz builds
>> successfully and without any change of features (as reported by the
>> configure phase) when built without those inputs.
>>
>> Also, I think the swig input should actually be a native input.
>>
>> I'll shortly send a patch with these changes. Do review and offer
>> feedback.
>
> Did you compare our package to the Graphviz project's annotated list of
> dependencies, found in the link below?
>
> http://www.graphviz.org/Download_source.php
>
> Some of the removed dependencies seem to have a use in graphviz.

Going by that list, I have wrongly removed only expat and libpng. What
about the other inputs I have removed?

[bug#27657] [PATCH] gnu: graphviz: Remove unnecessary inputs.

[Ludovic Courtès]

Hello,

Arun Isaac <arunisaac@systemreboot.net> skribis:

> * gnu/packages/graphviz.scm (graphviz)[inputs]: Remove libxrender, libx11,
> libxaw, expat, libjpeg, libpng.
> Move guile and swig to native-inputs.
> [native-inputs]: Remove bison.

Guile is most likely needed at run time, so it needs to be in ‘inputs’,
possibly in addition to being in ‘native-inputs’.

SWIG may also have a run-time support library, so it would need to be in
‘inputs’ in addition to ‘native-inputs’.

Now, all this is theoretical until we actually try to cross-build
Graphviz.

So I think the patch is OK, with or without changes along the lines
above.

Thanks,
Ludo’.

[bug#27657] [PATCH] gnu: wayland: Improve fix-graphviz phase.

[Arun Isaac]

* gnu/packages/freedesktop.scm (wayland)[arguments]: Return #t from
fix-graphviz phase. Add punctuation and upstream bug report link to comments.
---
 gnu/packages/freedesktop.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d0d7604b1..df2fe787f 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -371,13 +371,15 @@ Python.")
      `(#:parallel-tests? #f
        #:phases
        (modify-phases %standard-phases
-         ;; Remove record shapes to workaround graphviz 2.40.1 problems
+         ;; Remove record shapes to workaround graphviz 2.40.1 problems.
          ;; http://www.graphviz.org/content/i-havent-been-able-render-these-files-graphviz-226
-         ;; This will likely be fixed upstream in the next release
+         ;; This will likely be fixed upstream in the next release.
+         ;; https://lists.freedesktop.org/archives/wayland-devel/2017-June/034218.html
          (add-before 'build 'fix-graphviz
            (lambda _
              (substitute* "doc/doxygen/dot/x-architecture.gv"
-               (("Mrecord") "none")))))))
+               (("Mrecord") "none"))
+             #t)))))
     (native-inputs
      `(("doxygen" ,doxygen)
        ("graphviz" ,graphviz)
-- 
2.12.2

[bug#27657] [PATCH] gnu: graphviz: Remove unnecessary inputs.

[Arun Isaac]

Ludovic Courtès writes:

>> * gnu/packages/graphviz.scm (graphviz)[inputs]: Remove libxrender, libx11,
>> libxaw, expat, libjpeg, libpng.
>> Move guile and swig to native-inputs.
>> [native-inputs]: Remove bison.
>
> Guile is most likely needed at run time, so it needs to be in ‘inputs’,
> possibly in addition to being in ‘native-inputs’.
>
> SWIG may also have a run-time support library, so it would need to be in
> ‘inputs’ in addition to ‘native-inputs’.
>
> Now, all this is theoretical until we actually try to cross-build
> Graphviz.

There is much lack of clarity about this patch. No one (including
myself) is sure about what inputs/native-inputs are actually
needed. Let's abandon this patch for now, and come back later if
necessary.

> So I think the patch is OK, with or without changes along the lines
> above.

[bug#27657] [PATCH] gnu: graphviz: Remove unnecessary inputs.

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

> Ludovic Courtès writes:
>
>>> * gnu/packages/graphviz.scm (graphviz)[inputs]: Remove libxrender, libx11,
>>> libxaw, expat, libjpeg, libpng.
>>> Move guile and swig to native-inputs.
>>> [native-inputs]: Remove bison.
>>
>> Guile is most likely needed at run time, so it needs to be in ‘inputs’,
>> possibly in addition to being in ‘native-inputs’.
>>
>> SWIG may also have a run-time support library, so it would need to be in
>> ‘inputs’ in addition to ‘native-inputs’.
>>
>> Now, all this is theoretical until we actually try to cross-build
>> Graphviz.
>
> There is much lack of clarity about this patch. No one (including
> myself) is sure about what inputs/native-inputs are actually
> needed. Let's abandon this patch for now, and come back later if
> necessary.

Sounds reasonable.

Ludo’.

[bug#27657] [PATCH] gnu: wayland: Improve fix-graphviz phase.

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

> * gnu/packages/freedesktop.scm (wayland)[arguments]: Return #t from
> fix-graphviz phase. Add punctuation and upstream bug report link to comments.

OK for ‘staging’, thank you!

Ludo’.

bug#27657: [PATCH] gnu: wayland: Improve fix-graphviz phase.

[Arun Isaac]

Ludovic Courtès writes:

> Arun Isaac <arunisaac@systemreboot.net> skribis:
>
>> * gnu/packages/freedesktop.scm (wayland)[arguments]: Return #t from
>> fix-graphviz phase. Add punctuation and upstream bug report link to comments.
>
> OK for ‘staging’, thank you!

Pushed!