From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVGcg-0002RK-P0 for guix-patches@gnu.org; Wed, 12 Jul 2017 08:20:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVGcc-0005iJ-K2 for guix-patches@gnu.org; Wed, 12 Jul 2017 08:20:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60391) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVGcc-0005iB-Fx for guix-patches@gnu.org; Wed, 12 Jul 2017 08:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dVGcc-0000Il-94 for guix-patches@gnu.org; Wed, 12 Jul 2017 08:20:02 -0400 Subject: [bug#27657] [PATCH] gnu: graphviz: Update to 2.40.1. Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <81625ecf.AEMAM5Q5T1QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZZUFu@mailjet.com> <87r2xmk5fi.fsf@fastmail.com> Date: Wed, 12 Jul 2017 14:19:04 +0200 In-Reply-To: <87r2xmk5fi.fsf@fastmail.com> (Marius Bakke's message of "Tue, 11 Jul 2017 23:52:01 +0200") Message-ID: <87h8yhetl3.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke Cc: 27657@debbugs.gnu.org Marius Bakke skribis: > Arun Isaac 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 `libg= vc.la'." >> - (substitute* "lib/gvc/Makefile" >> - (("am__append_5 *=3D.*") >> - "am_append_5 =3D\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/d= oc") >> + (string-append doc "/share/graphviz/d= oc")) >> + #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/graphv= iz")) >> - (rename-file (string-append out "/share/gr= aphviz/doc") >> - (string-append doc "/share/gr= aphviz/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/extensio= ns"))) >> - (mkdir-p extdir) >> - (rename-file (string-append >> - lib "/graphviz/guile/libgv_guile.s= o") >> - (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/extension= s"))) >> + (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=E2=80=99s not as big as the current Graphviz. I=E2=80=99m fine with you switch to =E2=80=98modify-phases=E2=80=99 after t= his patch too. With 970 dependents, this should go to a new =E2=80=98staging=E2=80=99 bran= ch to be merged after =E2=80=98core-updates=E2=80=99 is merged. Fine with you? Thanks, Ludo=E2=80=99.