From d6cbae81c7c4dad025307c72141ce78d8d21b253 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Tue, 28 Mar 2017 19:34:41 -0700 Subject: Update/samtools (#3595) * Update samtools family to 1.4 * simple cleanup * Make bzip depends_on for future versions too --- var/spack/repos/builtin/packages/bcftools/package.py | 2 ++ var/spack/repos/builtin/packages/htslib/package.py | 2 ++ var/spack/repos/builtin/packages/samtools/package.py | 1 + 3 files changed, 5 insertions(+) diff --git a/var/spack/repos/builtin/packages/bcftools/package.py b/var/spack/repos/builtin/packages/bcftools/package.py index a1b4a06dbb..b9954c328a 100644 --- a/var/spack/repos/builtin/packages/bcftools/package.py +++ b/var/spack/repos/builtin/packages/bcftools/package.py @@ -34,9 +34,11 @@ class Bcftools(Package): homepage = "http://samtools.github.io/bcftools/" url = "https://github.com/samtools/bcftools/releases/download/1.3.1/bcftools-1.3.1.tar.bz2" + version('1.4', '50ccf0a073bd70e99cdb3c8be830416e') version('1.3.1', '575001e9fca37cab0c7a7287ad4b1cdb') depends_on('zlib') + depends_on('bzip2', when="@1.4:") def install(self, spec, prefix): make("prefix=%s" % prefix, "all") diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index 77829e71b9..20db1c918b 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -31,6 +31,8 @@ class Htslib(AutotoolsPackage): homepage = "https://github.com/samtools/htslib" url = "https://github.com/samtools/htslib/releases/download/1.3.1/htslib-1.3.1.tar.bz2" + version('1.4', '2a22ff382654c033c40e4ec3ea880050') version('1.3.1', '16d78f90b72f29971b042e8da8be6843') depends_on('zlib') + depends_on('bzip2', when="@1.4:") diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index b82a7e55d6..0793f8d9a1 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -33,6 +33,7 @@ class Samtools(Package): homepage = "www.htslib.org" url = "https://github.com/samtools/samtools/releases/download/1.3.1/samtools-1.3.1.tar.bz2" + version('1.4', '8cbd7d2a0ec16d834babcd6c6d85d691') version('1.3.1', 'a7471aa5a1eb7fc9cc4c6491d73c2d88') version('1.2', '988ec4c3058a6ceda36503eebecd4122') -- cgit v1.2.3-70-g09d2