about summary refs log tree commit diff
path: root/gn/packages/genenetwork.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gn/packages/genenetwork.scm')
-rw-r--r--gn/packages/genenetwork.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm
index 4450bfa..8c28a85 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -240,7 +240,6 @@ location of a putative QTL.")
               ("gemma-wrapper" ,gemma-wrapper)
               ("genenetwork2-files-small" ,genenetwork2-files-small)
               ("plink-ng-gn" ,plink-ng-gn)
-              ("pylmm-gn2" ,pylmm-gn2)
               ("nginx" ,nginx)
               ("python2-flask" ,python2-flask)
               ("gunicorn" ,gunicorn)
@@ -265,7 +264,8 @@ location of a putative QTL.")
               ;; ("python2-piddle-gn" ,python2-piddle-gn)
               ("python2-redis" ,python2-redis)
               ("python2-requests" ,python2-requests)
-              ; ("python2-pil1" ,python2-pil1) ; should move to pillow some day
+              ; ("python2-pil1" ,python2-pil1) ; merged to pillow (https://github.com/genenetwork/genenetwork2/pull/355)
+	            ("python2-pillow" ,python2-pillow)
               ("python2-requests" ,python2-requests)
               ("python2-rpy2" ,python2-rpy2)
               ("python2-scipy" ,python2-scipy)
@@ -306,14 +306,14 @@ location of a putative QTL.")
              (lambda* (#:key inputs #:allow-other-keys)
                       (let* (
                              (datafiles (string-append (assoc-ref inputs "genenetwork2-files-small") "/share/genenetwork2" ))
-                             (pylmmcmd (string-append (assoc-ref inputs "pylmm-gn2") "/bin/pylmm_redis"))
+                             ; (pylmmcmd (string-append (assoc-ref inputs "pylmm-gn2") "/bin/pylmm_redis"))
                              (plink2cmd (string-append (assoc-ref inputs "plink-ng-gn") "/bin/plink2"))
                              (gemmacmd (string-append (assoc-ref inputs "gemma") "/bin/gemma"))
                              )
 
                (substitute* '("etc/default_settings.py")
                             (("^GENENETWORK_FILES +=.*") (string-append "GENENETWORK_FILES = \"" datafiles "\"\n" ))
-                            (("^PYLMM_COMMAND =.*") (string-append "PYLMM_COMMAND = \"" pylmmcmd "\"\n" ))
+                            ; (("^PYLMM_COMMAND =.*") (string-append "PYLMM_COMMAND = \"" pylmmcmd "\"\n" ))
                             (("^PLINK_COMMAND =.*") (string-append "PLINK_COMMAND = \"" plink2cmd "\"\n" ))
                             (("^GEMMA_COMMAND =.*") (string-append "GEMMA_COMMAND = \"" gemmacmd "\"\n" ))
                             )