aboutsummaryrefslogtreecommitdiff
path: root/gn
diff options
context:
space:
mode:
authorPjotr Prins2020-05-22 11:12:38 -0500
committerPjotr Prins2020-05-22 11:12:38 -0500
commit4659b77ec38f46014e325c4294796c1a859e2646 (patch)
tree8d45e4d0db7f9e37d58e1252ab307c759acda8e1 /gn
parent3d6be821a8085cddf0e9011a99a386daa15d0cc6 (diff)
downloadguix-bioinformatics-4659b77ec38f46014e325c4294796c1a859e2646.tar.gz
Updated Gemma build
Diffstat (limited to 'gn')
-rw-r--r--gn/packages/gemma.scm29
1 files changed, 5 insertions, 24 deletions
diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm
index 9bbc960..758832e 100644
--- a/gn/packages/gemma.scm
+++ b/gn/packages/gemma.scm
@@ -141,10 +141,10 @@
(define-public gemma-gn2 ; guix candidate - generic openblas version
- (let ((commit "6b1e007ea9ead6123e9d7f078f3e59054047521d"))
+ (let ((commit "b309569fe9497befa008ac2d2cbc04f2e861ce76"))
(package
(name "gemma-gn2")
- (version (string-append "0.98-" (string-take commit 7)))
+ (version (string-append "0.98.2-" (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -153,32 +153,21 @@
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0gg4rrxcjbhfqfdaljnn86yffaa0n2d2j67j2gv47wvgrnn8fvwz"))))
+ "0bmwp2g7xm1zpixlljpf7zzsgj8f34pyxra7by30yxl1r52kfjdd"))))
(inputs `(
- ; ("gfortran:lib" ,gfortran "lib")
("gsl" ,gsl)
- ("eigen" ,eigen)
("shunit2" ,shunit2)
- ; ("lapack" ,lapack)
("openblas" ,openblas)
("zlib" ,zlib)
))
(native-inputs ; for running tests
`(("perl" ,perl)
("which" ,which)
- ; ("gcc@8" ,gcc-8)
))
(build-system gnu-build-system)
(arguments
- `(#:make-flags
- (list
- (string-append "EIGEN_INCLUDE_PATH="
- (assoc-ref %build-inputs "eigen")
- "/include/eigen3/")
- )
- #:phases
- ; "/include/eigen3/"
+ `(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'bin-mkdir
@@ -204,22 +193,14 @@ genome-wide association studies (GWAS).")
(inherit gemma-gn2)
(name "gemma-gn2-git")
(inputs `(
- ; ("gfortran:lib" ,gfortran "lib")
("gsl" ,gsl)
- ("eigen" ,eigen)
("shunit2" ,shunit2)
("openblas" ,openblas-git)
("zlib" ,zlib)
))
(arguments
- `(#:make-flags
- (list
- (string-append "EIGEN_INCLUDE_PATH="
- (assoc-ref %build-inputs "eigen")
- "/include/eigen3/")
- )
+ `(
#:phases
- ; "/include/eigen3/"
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'bin-mkdir