aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpjotrp2020-11-28 16:20:53 +0000
committerpjotrp2020-11-28 16:20:53 +0000
commit697a8d85ddb765aae22c757dc194052e09011dab (patch)
tree038a344a9875b94a617b3ebec1b0eeadbc90ae9d
parent16aeca47b1c3b9a6cbede7ab78945bbbf1aebf5e (diff)
downloadguix-bioinformatics-697a8d85ddb765aae22c757dc194052e09011dab.tar.gz
gemma-gn2: updated to latest
-rw-r--r--README.org2
-rw-r--r--gn/packages/gemma.scm10
-rw-r--r--gn/packages/yaj.scm1
3 files changed, 7 insertions, 6 deletions
diff --git a/README.org b/README.org
index e3770f7..02968a6 100644
--- a/README.org
+++ b/README.org
@@ -61,6 +61,8 @@ Install slurm with
* Common Workflow Language (CWL)
+/Note that CWL moved into Guix master!/
+
Install the common workflow language tool cwltool from this repo with
#+BEGIN_SRC bash
diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm
index e6d49b4..e780ea5 100644
--- a/gn/packages/gemma.scm
+++ b/gn/packages/gemma.scm
@@ -101,10 +101,10 @@
(define-public gemma-gn2 ; Version used in GeneNetwork. Guix candidate - generic openblas version
- (let ((commit "97547ee82e0bd1cc2210612415b0ceb135dbba6d"))
+ (let ((commit "f623b4775d47b2c2697a4925bd044412a7db49d3"))
(package
(name "gemma-gn2")
- (version (string-append "0.98.2-" (string-take commit 7)))
+ (version (string-append "0.98.3-" (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -113,7 +113,7 @@
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0p6pw4gm5fqr4yb9vklgj5abvqazmp1kk9cg3l2n8qsrj1p7j657"))))
+ "1p8a7kkfn1mmrg017aziy544aha8i9h6wd1x2dk3w2794wl33qb7"))))
; guix environment -C guix --ad-hoc gcc-toolchain gdb gsl openblas zlib bash ld-wrapper perl vim which
(inputs `(
("gsl" ,gsl)
@@ -177,10 +177,10 @@ genome-wide association studies (GWAS).")
))
(define-public gemma-gn2-dev ; Dev version for GeneNetwork. Not a Guix candidate
- (let ((commit "d53a04edc476d820de7a611cacc8b105115aa3cc"))
+ (let ((commit "f623b4775d47b2c2697a4925bd044412a7db49d3"))
(package
(name "gemma-gn2-dev")
- (version (string-append "0.98.2-" (string-take commit 7)))
+ (version (string-append "0.98.3-" (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
diff --git a/gn/packages/yaj.scm b/gn/packages/yaj.scm
index dc19f0f..1b56f42 100644
--- a/gn/packages/yaj.scm
+++ b/gn/packages/yaj.scm
@@ -45,7 +45,6 @@
#: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 javascript)
#:use-module (gn packages phewas)
#:use-module (gn packages python)