diff options
author | Pjotr Prins | 2019-02-21 10:41:00 -0600 |
---|---|---|
committer | Pjotr Prins | 2019-02-21 10:41:00 -0600 |
commit | 973806de86ccc8c83160c6262de26939b278522d (patch) | |
tree | 82f6197ea80e6122b003588d56f42ce0a104c5b5 | |
parent | 2dabf4acf3d56f6fbcc843dc1cae9507131345e5 (diff) | |
parent | f5bc342188b1b9156b0f960a3a6bb5f7069c07ba (diff) | |
download | guix-bioinformatics-973806de86ccc8c83160c6262de26939b278522d.tar.gz |
conflictgn-latest-20190213
-rw-r--r-- | gn/packages/genenetwork.scm | 3 | ||||
-rw-r--r-- | gn/packages/statistics.scm | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm index 12bf90b..8c28a85 100644 --- a/gn/packages/genenetwork.scm +++ b/gn/packages/genenetwork.scm @@ -243,6 +243,7 @@ location of a putative QTL.") ("nginx" ,nginx) ("python2-flask" ,python2-flask) ("gunicorn" ,gunicorn) + ("python2-pillow" ,python2-pillow) ("python2-cssselect" ,python2-cssselect) ("python2-elasticsearch" ,python2-elasticsearch) ("python2-htmlgen-gn" ,python2-htmlgen-gn) @@ -260,7 +261,7 @@ location of a putative QTL.") ("python2-parallel" ,python2-parallel) ("python2-parameterized" ,python2-parameterized) ("python2-passlib" ,python2-passlib) - ("python2-piddle-gn" ,python2-piddle-gn) + ;; ("python2-piddle-gn" ,python2-piddle-gn) ("python2-redis" ,python2-redis) ("python2-requests" ,python2-requests) ; ("python2-pil1" ,python2-pil1) ; merged to pillow (https://github.com/genenetwork/genenetwork2/pull/355) diff --git a/gn/packages/statistics.scm b/gn/packages/statistics.scm index cdabf69..459e0d1 100644 --- a/gn/packages/statistics.scm +++ b/gn/packages/statistics.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages popt) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages ruby) #:use-module (gnu packages statistics) #:use-module (gnu packages tbb) |