diff options
| author | pjotrp | 2020-05-06 09:16:01 -0500 |
|---|---|---|
| committer | pjotrp | 2020-05-06 09:16:01 -0500 |
| commit | a26d7f7eacefcd4c3b2339f81d99218f4b36dc69 (patch) | |
| tree | 1d6a1d6b8afea9d4bb935cc0a3911d3fe9771c3e /gn/services/genenetwork.scm | |
| parent | 52ba4c45ddf6fcb811e88c5efb12dca200c0bd7e (diff) | |
| parent | 5390e28c3308d0f9ce7ee2b96c9c4f31e3a7861b (diff) | |
| download | guix-bioinformatics-a26d7f7eacefcd4c3b2339f81d99218f4b36dc69.tar.gz | |
Merge branch 'master' of http://git.genenetwork.org/guix-bioinformatics/guix-bioinformatics
Diffstat (limited to 'gn/services/genenetwork.scm')
| -rw-r--r-- | gn/services/genenetwork.scm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gn/services/genenetwork.scm b/gn/services/genenetwork.scm index 0978cd2..4693152 100644 --- a/gn/services/genenetwork.scm +++ b/gn/services/genenetwork.scm @@ -2,13 +2,13 @@ (use-modules (gnu) (gn packages genenetwork) - (gn packages python) + (gn packages python24) (gn packages web)) (use-service-modules web) (use-package-modules python) (define %mod-python-path - (file-append mod-python "/lib/python2.7/site-packages")) + (file-append mod-python "/lib/python2.4/site-packages")) (operating-system (host-name "genenetwork") @@ -22,15 +22,15 @@ ;; No firmware for VMs (firmware '()) - (packages (cons* python-2 + (packages (cons* python-2.4 mod-python - python2-qtlreaper - python2-htmlgen-gn - python2-json-GN1 - python2-piddle - python2-pyx-GN1 - python2-pyxlwriter - python2-svg-GN1 + python24-qtlreaper + ;python24-htmlgen-gn + python24-json-GN1 + python24-piddle + python24-pyx-GN1 + python24-pyxlwriter + python24-svg-GN1 %base-packages)) (services (list (service httpd-service-type @@ -38,7 +38,7 @@ (config (httpd-config-file (server-name "www.genenetwork.org") - (document-root (file-append genenetwork "/web")) + (document-root (file-append genenetwork1 "/web")) (listen '("8811")) (modules (cons* (httpd-module @@ -46,8 +46,8 @@ (file (file-append mod-python "/modules/mod_python.so"))) %default-httpd-modules)) (extra-config (list "\ -PythonPath \"sys.path+['" %mod-python-path "', '" (file-append genenetwork "/web/webqtl") "']\" -<Directory " (file-append genenetwork "/web/webqtl") "> +PythonPath \"sys.path+['" %mod-python-path "', '" (file-append genenetwork1 "/web/webqtl") "']\" +<Directory " (file-append genenetwork1 "/web/webqtl") "> SetHandler python-program PythonHandler mod_python.publisher PythonAutoReload Off |