diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 7ae62b15d34a..97e081f908ef 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, zlib, htslib }: +{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, perl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - version = "1.3.1"; + major = "1.4"; + version = "${major}.0"; src = fetchurl { - url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2"; - sha256 = "095ry68vmz9q5s1scjsa698dhgyvgw5aicz24c19iwfbai07mhqj"; + url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2"; + sha256 = "0k93mq3lf73dch81p4zxi0bdll567acxfa81qzbzkqflgsjb1ccg"; }; - buildInputs = [ zlib ]; + buildInputs = [ zlib bzip2 lzma perl ]; makeFlags = [ "HSTDIR=${htslib}" diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index e97af1ea0ee6..827c1448693a 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,14 +3,15 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - version = "1.3.1"; + major = "1.4"; + version = "${major}.0"; src = fetchurl { - url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2"; - sha256 = "0znnnxc467jbf1as2dpskrjhfh8mbll760j6w6rdkwlwbqsp8gbc"; + url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2"; + sha256 = "1x73c0lxvd58ghrmaqqyp56z7bkmp28a71fk4ap82j976pw5pbls"; }; - buildInputs = [ zlib ncurses htslib ]; + buildInputs = [ zlib ncurses ]; configureFlags = [ "--with-htslib=${htslib}" ] ++ stdenv.lib.optional (ncurses == null) "--without-curses"; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 29fb338c8389..a74905b5ba1d 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, zlib, bzip2, lzma, curl }: stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "${major}.0"; pname = "htslib"; - version = "1.3.2"; + major = "1.4"; src = fetchurl { - url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2"; - sha256 = "0iq3blw23s55vkr1z88p9y2dqrb2dybzhl6hz2nlk53ncihrxcdr"; + url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2"; + sha256 = "0l1ki3sqfhawfn7fx9v7i2pm725jki4c5zij9j96xka5zwc8iz2w"; }; - buildInputs = [ zlib ]; + buildInputs = [ zlib bzip2 lzma curl ]; + + configureFlags = "--enable-libcurl"; # optional but strongly recommended + + installFlags = "prefix=$(out)"; meta = with stdenv.lib; { description = "A C library for reading/writing high-throughput sequencing data";