From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dV2cb-0000cj-7i for guix-patches@gnu.org; Tue, 11 Jul 2017 17:23:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dV2cY-00064b-3f for guix-patches@gnu.org; Tue, 11 Jul 2017 17:23:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dV2cX-00064U-Vy for guix-patches@gnu.org; Tue, 11 Jul 2017 17:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dV2cX-0005cB-OK for guix-patches@gnu.org; Tue, 11 Jul 2017 17:23:01 -0400 Subject: [bug#27657] [PATCH] gnu: graphviz: Update to 2.40.1. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <81625ecf.AEMAM5Q5T1QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZZUFu@bnc3.mailjet.com>) id 1dV2bU-00082u-Lw for guix-patches@gnu.org; Tue, 11 Jul 2017 17:21:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <81625ecf.AEMAM5Q5T1QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZZUFu@bnc3.mailjet.com>) id 1dV2bR-0005PA-Hd for guix-patches@gnu.org; Tue, 11 Jul 2017 17:21:56 -0400 Received: from o125.p9.mailjet.com ([87.253.234.125]:44080) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <81625ecf.AEMAM5Q5T1QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZZUFu@bnc3.mailjet.com>) id 1dV2bR-0005Ny-5e for guix-patches@gnu.org; Tue, 11 Jul 2017 17:21:53 -0400 Message-Id: <81625ecf.AEMAM5Q5T1QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZZUFu@mailjet.com> From: Arun Isaac Date: Wed, 12 Jul 2017 02:51:28 +0530 MIME-Version: 1.0 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: 27657@debbugs.gnu.org * 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 *=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/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/graph= viz/doc") - (string-append doc "/share/graph= viz/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) --=20 2.12.2 =