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

gnu: vsearch: Update to 1.10.0. 

* gnu/packages/bioinformatics.scm (vsearch): Update to 1.10.0.
[origin]: Adapt to changes in bundling of cityhash.
This commit is contained in:
Ben Woodcroft 2016-02-15 22:22:01 +10:00
parent a64a8c465d
commit cf6edaba74
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnu/packages/bioinformatics.scm
View File

@ -1,3 +1,4 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2015, 2016 Ben Woodcroft <donttrustben@gmail.com>
@ -3353,7 +3354,7 @@ data in the form of VCF files.")
(define-public vsearch (define-public vsearch
(package (package
(name "vsearch") (name "vsearch")
(version "1.4.1") (version "1.10.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3363,7 +3364,7 @@ data in the form of VCF files.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0b1359wbzgb2cm04h7dq05v80vik88hnsv298xxd1q1f2q4ydni7")) "1i3bad7gnn2y3a1yfixzshd99xdkjc8w5bxzgifpysc6jiljwvb5"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -3373,14 +3374,24 @@ data in the form of VCF files.")
-O3 -mtune=native -Wall -Wsign-compare") -O3 -mtune=native -Wall -Wsign-compare")
(string-append "AM_CXXFLAGS=-lcityhash" (string-append "AM_CXXFLAGS=-lcityhash"
" -O3 -Wall -Wsign-compare")) " -O3 -Wall -Wsign-compare"))
(("^__top_builddir__bin_vsearch_SOURCES = cityhash/city.h \\\\") (("^__top_builddir__bin_vsearch_SOURCES = city.h \\\\")
"__top_builddir__bin_vsearch_SOURCES = \\") "__top_builddir__bin_vsearch_SOURCES = \\")
(("^cityhash/config.h \\\\") "\\") (("^city.h \\\\") "\\")
(("^cityhash/city.cc \\\\") "\\")) (("^citycrc.h \\\\") "\\")
(("^libcityhash_a.*") "")
(("noinst_LIBRARIES = libcpu_sse2.a libcpu_ssse3.a \
libcityhash.a")
"noinst_LIBRARIES = libcpu_sse2.a libcpu_ssse3.a")
(("__top_builddir__bin_vsearch_LDADD = libcpu_ssse3.a \
libcpu_sse2.a libcityhash.a")
"__top_builddir__bin_vsearch_LDADD = libcpu_ssse3.a \
libcpu_sse2.a -lcityhash"))
(substitute* "src/vsearch.h" (substitute* "src/vsearch.h"
(("^\\#include \"cityhash/city.h\"") (("^\\#include \"city.h\"") "#include <city.h>")
"#include <city.h>")) (("^\\#include \"citycrc.h\"") "#include <citycrc.h>"))
(delete-file-recursively "src/cityhash") (delete-file "src/city.h")
(delete-file "src/citycrc.h")
(delete-file "src/city.cc")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments