diff options
| -rw-r--r-- | gn/packages/bnw.scm | 2 | ||||
| -rw-r--r-- | gn/packages/genenetwork.scm | 2 | ||||
| -rw-r--r-- | gn/packages/graphviz.scm | 42 |
3 files changed, 2 insertions, 44 deletions
diff --git a/gn/packages/bnw.scm b/gn/packages/bnw.scm index 043077d..bdcaeb0 100644 --- a/gn/packages/bnw.scm +++ b/gn/packages/bnw.scm @@ -6,7 +6,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages python) #:use-module (gnu packages statistics) - #:use-module (gn packages graphviz) + #:use-module (past packages graphviz) #:use-module (gn packages javascript) #:use-module (gn packages maths) #:use-module (gn packages python) diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm index 7925bd5..e529ff8 100644 --- a/gn/packages/genenetwork.scm +++ b/gn/packages/genenetwork.scm @@ -31,13 +31,13 @@ #:use-module (gnu packages web) #:use-module (gnu packages wget) #:use-module (gnu packages xml) + #:use-module (past packages graphviz) #:use-module (past packages python) #:use-module (gn packages bioinformatics) #:use-module (gn packages twint) #:use-module (gn packages crates-io) #:use-module (gn packages elixir) #:use-module (gn packages gemma) - #:use-module (gn packages graphviz) #:use-module (gn packages javascript) #:use-module (gn packages phewas) #:use-module (gn packages python) diff --git a/gn/packages/graphviz.scm b/gn/packages/graphviz.scm deleted file mode 100644 index 22a8959..0000000 --- a/gn/packages/graphviz.scm +++ /dev/null @@ -1,42 +0,0 @@ -(define-module (gn packages graphviz) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix utils) - #:use-module (gnu packages gl) - #:use-module (gnu packages graphviz) - #:use-module (gnu packages gtk) - #:use-module (srfi srfi-1)) - -(define-public graphviz-2.26 - (package - (inherit graphviz) - (name "graphviz") - (version "2.26.3") - (outputs '("out")) - (source - (origin - (method url-fetch) - (uri (string-append - ;; TODO: Replace with official release - "mirror://debian/pool/main/g/graphviz/" - "graphviz_" version ".orig.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "18bzyg17ni0lpcd2g5dhan8fjv3vzkjym38jq8vm42did5p9j47l")))) - ;; TODO: unbundle libraries? - (arguments - `(#:configure-flags '("--enable-swig=no") - ,@(substitute-keyword-arguments (package-arguments graphviz) - ((#:phases phases) - `(modify-phases ,phases - (delete 'move-docs) ; one output - (delete 'move-guile-bindings)))))) - (inputs - ;; TODO(?): Add perl, guile@1.8, gtk@2, lua5.1, tcl8.[3-6], rsvg, python-2.4 - `(("gdk-pixbuf" ,gdk-pixbuf) - ("freeglut" ,freeglut) - ,@(fold alist-delete (package-inputs graphviz) - '("libjpeg-turbo" "guile" "swig")))) - (license license:cpl1.0))) |