aboutsummaryrefslogtreecommitdiff
path: root/gn
diff options
context:
space:
mode:
Diffstat (limited to 'gn')
-rw-r--r--gn/packages/genenetwork.scm17
-rw-r--r--gn/services/genenetwork.scm16
2 files changed, 16 insertions, 17 deletions
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm
index 0e6e359..a3ed18f 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -41,6 +41,7 @@
#:use-module (gnu packages wget)
#:use-module (gnu packages xml)
#:use-module (past packages python)
+ #:use-module (past packages web)
#:use-module (gn packages bioinformatics)
#:use-module (gn packages twint)
#:use-module (gn packages databases)
@@ -708,9 +709,21 @@ written in C")
(native-inputs
`(("ghostscript" ,ghostscript)
("graphviz" ,graphviz)
- ("python24" ,python-2.4)
- ("python-piddle" ,python24-piddle)
("wget" ,wget)))
+ (propagated-inputs
+ `(("python" ,python-2.4)
+ ("httpd-with-mod-python" ,httpd22-with-mod-python)
+ ("python-htmlgen-GN1" ,python24-htmlgen-GN1)
+ ("python-json-GN1" ,python24-json-GN1)
+ ("python-mysqlclient" ,python24-mysqlclient)
+ ("python-numarray" ,python24-numarray)
+ ("python-piddle" ,python24-piddle)
+ ("python-pp-GN1" ,python24-pp-GN1)
+ ("python-pyx" ,python24-pyx)
+ ("python-pyxlwriter" ,python24-pyxlwriter)
+ ("python-qtlreaper" ,python24-qtlreaper)
+ ("python-rpy2" ,python24-rpy2)
+ ("python-svg-GN1" ,python24-svg-GN1)))
(arguments
`(#:tests? #f ; no tests
#:phases
diff --git a/gn/services/genenetwork.scm b/gn/services/genenetwork.scm
index c00c808..bc30c5b 100644
--- a/gn/services/genenetwork.scm
+++ b/gn/services/genenetwork.scm
@@ -19,21 +19,7 @@
(file-systems %base-file-systems)
;; No firmware for VMs
(firmware '())
-
- (packages (cons* python-2.4
- python24-htmlgen-GN1
- python24-json-GN1
- python24-mysqlclient ; MySQLdb
- python24-numarray
- python24-piddle
- python24-pp-GN1 ; not python24-parallel, we need an older version
- python24-pyx
- python24-pyxlwriter
- python24-qtlreaper
- python24-rpy2
- python24-svg-GN1
- %base-packages))
-
+ (packages (cons* %base-packages))
(services (list (service special-files-service-type
;; The genotypes folder doesn't have it's shebangs patched.
`(("/usr/bin/python" ,(file-append python-2.4 "/bin/python"))))