From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
To: 33936@debbugs.gnu.org
Cc: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Subject: [bug#33936] [PATCH 1/3] gnu: Add graphviz-2.38.
Date: Mon, 31 Dec 2018 14:48:15 +0100 [thread overview]
Message-ID: <20181231134817.713-1-ricardo.wurmus@mdc-berlin.de> (raw)
In-Reply-To: <idjh8et6ci5.fsf@bimsb-sys02.mdc-berlin.net>
* 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 <ludo@gnu.org>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
-;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org>
@@ -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
next prev parent reply other threads:[~2018-12-31 13:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-31 13:40 [bug#33936] Add python-pygraphviz Ricardo Wurmus
2018-12-31 13:48 ` Ricardo Wurmus [this message]
2018-12-31 13:48 ` [bug#33936] [PATCH 2/3] gnu: Add python-doctest-ignore-unicode Ricardo Wurmus
2018-12-31 13:48 ` [bug#33936] [PATCH 3/3] gnu: Add python-graphviz Ricardo Wurmus
2019-01-12 10:44 ` [bug#33936] Add python-pygraphviz Ludovic Courtès
2019-01-13 9:08 ` bug#33936: " Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181231134817.713-1-ricardo.wurmus@mdc-berlin.de \
--to=ricardo.wurmus@mdc-berlin.de \
--cc=33936@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.