aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoel Janssen2016-02-18 10:52:24 +0100
committerRoel Janssen2016-02-18 10:52:24 +0100
commit6d23ddccfc26a4afa77a88f5cf74479adc4bff26 (patch)
tree66e39f6c3e6eb5e2e9fee3649ebd273a89bdff88
parent8d7549806cb58e14a9432211ebc83f944f8fee1a (diff)
parenteb3d652afc40645db643a0b8df8a9598338ffea0 (diff)
downloadguix-bioinformatics-6d23ddccfc26a4afa77a88f5cf74479adc4bff26.tar.gz
Merge with upstream
-rw-r--r--gn/packages/bioinformatics.scm9
1 files changed, 4 insertions, 5 deletions
diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index d840875..a2da94b 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -373,11 +373,10 @@ association studies (GWAS).")
(sha256
(base32
"09hvy9mf4dnmkb8qg49viffzrxk53m2kr4r955m84dxaa5pdrjhd"))))
- (propagated-inputs `(
+ (propagated-inputs `( ;; propagated for development purposes
("python" ,python-2) ;; probably superfluous
- ("r" ,r)
- ))
- (inputs `(
+ ("r" ,r)
+ ("redis" ,redis)
("mysql" ,mysql)
("gemma" ,gemma-git)
("plink2" ,plink-ng)
@@ -403,7 +402,7 @@ association studies (GWAS).")
("python2-scipy" ,python2-scipy)
("python2-simplejson" ,python2-simplejson)
("python2-pyyaml" ,python2-pyyaml)
- ("python-xlsxwriter" ,python-xlsxwriter)
+ ("python2-xlsxwriter" ,python2-xlsxwriter)
;; python-yolk is not needed
("plink" ,plink)
("qtlreaper" ,qtlreaper)