aboutsummaryrefslogtreecommitdiff
path: root/gn/packages/genenetwork.scm
diff options
context:
space:
mode:
authorpjotrp2017-08-24 09:18:08 +0000
committerpjotrp2017-08-24 09:18:08 +0000
commitedee34ded00e323231e362fd2a3d33b73949d2ab (patch)
treea10245134cf46c162ccb4b5b6a904909efe62577 /gn/packages/genenetwork.scm
parent66176c459477b479ac4cf7c9c83bec872e7ea0dc (diff)
parentffc2270004fccd6c0f9456891c99d91526bca1bf (diff)
downloadguix-bioinformatics-edee34ded00e323231e362fd2a3d33b73949d2ab.tar.gz
Conflict
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 b55c37f..776a7d1 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -44,7 +44,7 @@
#:use-module (gnu packages bootstrap)
#:use-module (gnu packages version-control)
#:use-module (gn packages bioinformatics)
- ; #:use-module (gn packages gemma)
+ #:use-module (gn packages gemma)
#:use-module (gn packages javascript)
#:use-module (gn packages phewas)
#:use-module (gn packages python)
@@ -152,7 +152,7 @@ location of a putative QTL.")
(let ((commit "1538ffd33af19e6ac922b4ee85fe701408968dfd"))
(package
(name "genenetwork2")
- (version (string-append "2.10rc3-" (string-take commit 7) ))
+ (version (string-append "2.10rc4-" (string-take commit 7) ))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -175,7 +175,7 @@ location of a putative QTL.")
("r-wgcna" ,r-wgcna)
("redis" ,redis)
("mysql" ,mysql)
- ("gemma" ,gemma)
+ ("gemma-git-gn2" ,gemma-git-gn2)
("genenetwork2-files-small" ,genenetwork2-files-small)
("plink-ng" ,plink-ng)
("pylmm-gn2" ,pylmm-gn2)
@@ -233,7 +233,7 @@ location of a putative QTL.")
(datafiles (string-append (assoc-ref inputs "genenetwork2-files-small") "/share/genenetwork2" ))
(pylmmcmd (string-append (assoc-ref inputs "pylmm-gn2") "/bin/pylmm_redis"))
(plink2cmd (string-append (assoc-ref inputs "plink-ng") "/bin/plink2"))
- (gemmacmd (string-append (assoc-ref inputs "gemma") "/bin/gemma"))
+ (gemmacmd (string-append (assoc-ref inputs "gemma-git-gn2") "/bin/gemma"))
)
(substitute* '("etc/default_settings.py")