diff options
| author | Pjotr Prins | 2021-02-05 05:33:44 -0600 |
|---|---|---|
| committer | Pjotr Prins | 2021-02-05 05:33:44 -0600 |
| commit | 5329ba6cb2c303765dbb6eeef5f60667fb6e362c (patch) | |
| tree | 237e1f1779900381ffcc071d98ef9e14ad00c315 | |
| parent | 8d4351d436b7cacb3ff3bdd1d8ee86974f2ad979 (diff) | |
| parent | 2b61288f72073516739135f5ef11ee3b11d540d0 (diff) | |
| download | guix-bioinformatics-5329ba6cb2c303765dbb6eeef5f60667fb6e362c.tar.gz | |
Merge pull request 'Move packages to genetwork1 propagated inputs' (#11) from Chore/Add-required-pkgs-to-gn1-inputs into master
Reviewed-on: http://git.genenetwork.org/guix-bioinformatics/guix-bioinformatics/pulls/11
| -rw-r--r-- | gn/packages/genenetwork.scm | 17 | ||||
| -rw-r--r-- | gn/services/genenetwork.scm | 16 |
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")))) |