From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dV35d-0001GU-A0 for guix-patches@gnu.org; Tue, 11 Jul 2017 17:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dV35a-0004xU-7Q for guix-patches@gnu.org; Tue, 11 Jul 2017 17:53:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59967) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dV35Z-0004xH-Tx for guix-patches@gnu.org; Tue, 11 Jul 2017 17:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dV35Z-0006Yv-Nv for guix-patches@gnu.org; Tue, 11 Jul 2017 17:53:01 -0400 Subject: [bug#27657] [PATCH] gnu: graphviz: Update to 2.40.1. Resent-Message-ID: From: Marius Bakke In-Reply-To: <81625ecf.AEMAM5Q5T1QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZZUFu@mailjet.com> References: <81625ecf.AEMAM5Q5T1QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZZUFu@mailjet.com> Date: Tue, 11 Jul 2017 23:52:01 +0200 Message-ID: <87r2xmk5fi.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: Arun Isaac , 27657@debbugs.gnu.org --=-=-= Content-Type: text/plain 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 `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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlllSIIACgkQoqBt8qM6 VPrVqQf+OtMiJnEVZSpFJq2/KkE4TZufgYcVdxt5N0Sz+Vuf8OJKOYmUSgfNPAJf nAjwmTpvhsbnKsAfr3BTTg/ZkclYn+qPBLULP+SN1EmuGZKLmK+37e8L5cje42Fr Cw2i4Nd+6QuyNDUkgKahY/FmbEXmXlVsuKD0HI9ReeL2wNbpXBKcia1e5r4UMjEO j+x5c4ECrDsmICChWCWuLfiS59xXa2AsMf022USGhCbCjRID4Gy6tKr2E/uaIKvV PbOf0x4OuEvbMLbkxfnw+35MtkIJVUPmzZ68Ak1UVM6+dS0f/j7XD7NnPAnR8QPC 75zAWJ966p/luGU+bFG50xvzsRADjA== =THis -----END PGP SIGNATURE----- --=-=-=--