nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into core-updates

This commit is contained in:
Andreas Enge 2016-07-24 18:42:56 +02:00
parent fe7fa35320 e03a515304
commit 1abdc167d3
No known key found for this signature in database
GPG Key ID: F7D5C9BF765C61E3
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gnu/packages/bioinformatics.scm
View File

@ -1831,7 +1831,7 @@ similarity of community members.")
(define-public fasttree (define-public fasttree
(package (package
(name "fasttree") (name "fasttree")
(version "2.1.8") (version "2.1.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1839,7 +1839,7 @@ similarity of community members.")
version ".c")) version ".c"))
(sha256 (sha256
(base32 (base32
"0dzqc9vr9iiiw21y159xfjl2z90vw0y7r4x6456pcaxiy5hd2wmi")))) "0ljvvw8i1als1wbfzvrf15c3ii2vw9db20a259g6pzg34xyyb97k"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; no "check" target
@ -1848,37 +1848,37 @@ similarity of community members.")
(delete 'unpack) (delete 'unpack)
(delete 'configure) (delete 'configure)
(replace 'build (replace 'build
(lambda* (#:key source #:allow-other-keys) (lambda* (#:key source #:allow-other-keys)
(and (zero? (system* "gcc" (and (zero? (system* "gcc"
"-O3" "-O3"
"-finline-functions" "-finline-functions"
"-funroll-loops" "-funroll-loops"
"-Wall" "-Wall"
"-o" "-o"
"FastTree" "FastTree"
source source
"-lm")) "-lm"))
(zero? (system* "gcc" (zero? (system* "gcc"
"-DOPENMP" "-DOPENMP"
"-fopenmp" "-fopenmp"
"-O3" "-O3"
"-finline-functions" "-finline-functions"
"-funroll-loops" "-funroll-loops"
"-Wall" "-Wall"
"-o" "-o"
"FastTreeMP" "FastTreeMP"
source source
"-lm"))))) "-lm")))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") (let ((bin (string-append (assoc-ref outputs "out")
"/bin"))) "/bin")))
(mkdir-p bin) (mkdir-p bin)
(copy-file "FastTree" (copy-file "FastTree"
(string-append bin "/FastTree")) (string-append bin "/FastTree"))
(copy-file "FastTreeMP" (copy-file "FastTreeMP"
(string-append bin "/FastTreeMP")) (string-append bin "/FastTreeMP"))
#t)))))) #t))))))
(home-page "http://www.microbesonline.org/fasttree") (home-page "http://www.microbesonline.org/fasttree")
(synopsis "Infers approximately-maximum-likelihood phylogenetic trees") (synopsis "Infers approximately-maximum-likelihood phylogenetic trees")
(description (description