From patchwork Wed Jan 2 16:17:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 630 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E2454169F5; Wed, 2 Jan 2019 16:19:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 5DC4B169EF for ; Wed, 2 Jan 2019 16:19:53 +0000 (GMT) Received: from localhost ([127.0.0.1]:45921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gejFI-0004t0-V2 for patchwork@mira.cbaines.net; Wed, 02 Jan 2019 11:19:52 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33952] [PATCH 06/14] gnu: Add graphviz-2.38. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Jan 2019 16:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: <33952@debbugs.gnu.org> Received: via spool by 33952-submit@debbugs.gnu.org id=B33952.15464459258248 (code B ref 33952); Wed, 02 Jan 2019 16:19:04 +0000 Received: (at 33952) by debbugs.gnu.org; 2 Jan 2019 16:18:45 +0000 Received: from localhost ([127.0.0.1]:44904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gejE6-00028d-MA for submit@debbugs.gnu.org; Wed, 02 Jan 2019 11:18:45 -0500 Received: from pegasus.bbbm.mdc-berlin.de ([141.80.25.20]:35716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gejE5-00028H-IX for 33952@debbugs.gnu.org; Wed, 02 Jan 2019 11:18:38 -0500 Received: from localhost (localhost [127.0.0.1]) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTP id 1016BC84FD1 for <33952@debbugs.gnu.org>; Wed, 2 Jan 2019 17:18:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mdc-berlin.de; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mdc; t= 1546445911; x=1548260312; bh=vSP/Ov5g1M19t7JCcLDN1FJJiYkfpLUNjVh 5pR0RYCM=; b=ik04mNPiH6bX1G70PBbVxwAr4osBQBSAl+QFDNBAxTj3tOr0xSW 3ahN8c/VsJx+YV7QLJKsrZ6A8ua6faY7o9m96JzJqPhYF30HhJDgWGakJGf/8JHW bxhCTbhKNGrbYLtwiCEQNqZV7/vK6cVL/Ceb9mut1pED6P4XGzmncW4E= X-Virus-Scanned: amavisd-new at mdc-berlin.de Received: from pegasus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (pegasus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4S3w-fA1Ffeo for <33952@debbugs.gnu.org>; Wed, 2 Jan 2019 17:18:31 +0100 (CET) Received: from SW-IT-P-CAS4.mdc-berlin.net (puck.citx.mdc-berlin.de [141.80.36.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTPS for <33952@debbugs.gnu.org>; Wed, 2 Jan 2019 17:18:31 +0100 (CET) Received: from localhost (141.80.113.103) by SW-IT-P-CAS4.mdc-berlin.net (141.80.113.59) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 2 Jan 2019 17:18:31 +0100 From: Ricardo Wurmus Date: Wed, 2 Jan 2019 17:17:59 +0100 Message-ID: <20190102161807.28297-6-ricardo.wurmus@mdc-berlin.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190102161807.28297-1-ricardo.wurmus@mdc-berlin.de> References: <20190102161807.28297-1-ricardo.wurmus@mdc-berlin.de> MIME-Version: 1.0 X-Originating-IP: [141.80.113.103] X-TM-AS-Product-Ver: SMEX-12.5.0.1684-8.5.1010-24332.001 X-TM-AS-Result: No-2.241300-8.000000-10 X-TMASE-MatchedRID: BKYvX4ImMZt7qToVEfwBPCmjEOrcO6AyTJDl9FKHbrkAhmnHHeGnvQn9 ofQNoBQFiXjq2ugFXy/lcVvS1Q3fCmTTipqtENlTk3rl+MaNgxDPmHNCdSewdiMlNiyEyQgPzsJ V9eUE38poCTVycA8zsauJm2QuCxjNJnhvvcMijbXAJnGRMfFxyUCrr/LkAQ460TtDAM4INC/qD1 FjJ81U5tBHSdafBmNg7GV9zPZnVko5YT8YJoGWS1z+axQLnAVBv8jdqvFOu+KHlDUCu0I+XF2kx KIqW9ov585VzGMOFzA9wJeM2pSaRcK21zBg2KlfWDfDBnmaIysOXJ6kzOEpM1Nt1d+xFQKwsqtl YX6Z4u6hHMfOU31bvouRF1tNcc5RPfKs+zdM1XSsRKNgO0Z78e1/EWrhrdHor228gUDjHklzJSo 3e5CVtD9p64ac051+EhXhGqrpd2ga1FOL7rDRI1XK9tOD+u6c X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10-2.241300-8.000000 X-TMASE-Version: SMEX-12.5.0.1684-8.5.1010-24332.001 X-TM-SNTS-SMTP: DD3D91724144D8738AFB81A45FF7F0D6C861904672632CEC7C734075A703B20C2000:9 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ricardo Wurmus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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")