From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gejEZ-0004KJ-Rl for guix-patches@gnu.org; Wed, 02 Jan 2019 11:19:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gejEX-0006nz-93 for guix-patches@gnu.org; Wed, 02 Jan 2019 11:19:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46809) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gejEX-0006nr-5h for guix-patches@gnu.org; Wed, 02 Jan 2019 11:19:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gejEX-0002Ae-0T for guix-patches@gnu.org; Wed, 02 Jan 2019 11:19:05 -0500 Subject: [bug#33952] [PATCH 06/14] gnu: Add graphviz-2.38. Resent-Message-ID: From: Ricardo Wurmus Date: Wed, 2 Jan 2019 17:17:59 +0100 Message-ID: <20190102161807.28297-6-ricardo.wurmus@mdc-berlin.de> In-Reply-To: <20190102161807.28297-1-ricardo.wurmus@mdc-berlin.de> References: <20190102161807.28297-1-ricardo.wurmus@mdc-berlin.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: 33952@debbugs.gnu.org Cc: Ricardo Wurmus * gnu/packages/graphviz.scm (graphviz-2.38): New variable. --- gnu/packages/graphviz.scm | 51 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 569923d4e..47342b784 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2015 Ludovic Courtès ;;; Copyright © 2015 Efraim Flashner ;;; Copyright © 2016 Theodoros Foradis -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2018 Mathieu Lirzin @@ -27,7 +27,10 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix utils) #:use-module (gnu packages xorg) + #:use-module (gnu packages flex) #:use-module (gnu packages gtk) #:use-module (gnu packages xml) #:use-module (gnu packages glib) @@ -35,6 +38,7 @@ #:use-module (gnu packages bison) #:use-module (gnu packages image) #:use-module (gnu packages autotools) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -43,6 +47,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gd) #:use-module (gnu packages swig) + #:use-module (gnu packages tcl) #:use-module (gnu packages python) #:use-module (gnu packages tex) #:use-module ((guix licenses) #:prefix license:)) @@ -114,6 +119,50 @@ software engineering, database and web design, machine learning, and in visual interfaces for other technical domains.") (license license:epl1.0))) +;; Older Graphviz needed for pygraphviz. See +;; https://github.com/pygraphviz/pygraphviz/issues/175 +(define-public graphviz-2.38 + ;; This commit corresponds to the changelog change for version 2.38.0. + ;; There are no tags. + (let ((commit "f54ac2c9313ae80ccf76ef4ac6aa9be820a23126") + (revision "1")) + (package (inherit graphviz) + (name "graphviz") + (version (git-version "2.38.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/graphviz/graphviz.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vjg308gflmi1khgjmcj431cnkrlv12bg4cqah39mwhny92jy92x")))) + (arguments + (substitute-keyword-arguments (package-arguments graphviz) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'prepare-bootstrap + (lambda _ + (substitute* "autogen.sh" + (("/bin/sh") (which "sh")) + (("\\$GRAPHVIZ_VERSION_DATE") "0")) + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "SHELL" (which "sh")) + + (map make-file-writable (find-files "." ".*")) + #t)) + (replace 'bootstrap + (lambda _ (invoke (which "sh") "autogen.sh" "NOCONFIG") #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("flex" ,flex) + ("perl" ,perl) + ("tcl" ,tcl) + ,@(package-native-inputs graphviz)))))) + (define-public python-graphviz (package (name "python-graphviz") -- 2.19.1