diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-05-11 07:08:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-11 07:08:56 +0100 |
| commit | be19ad150c452c5104cf7dd4d97d79746e5756b6 (patch) | |
| tree | 2d762321c9169d9f9611673f38193f90ebcfff9a /pkgs/applications/science | |
| parent | 408d06f6ec7f4a3538647fb3617f6a8cedcce6b6 (diff) | |
| parent | 8d1bebf83c5f07e30e8c32700d0dfe7fb65008b1 (diff) | |
| download | nixlib-be19ad150c452c5104cf7dd4d97d79746e5756b6.tar nixlib-be19ad150c452c5104cf7dd4d97d79746e5756b6.tar.gz nixlib-be19ad150c452c5104cf7dd4d97d79746e5756b6.tar.bz2 nixlib-be19ad150c452c5104cf7dd4d97d79746e5756b6.tar.lz nixlib-be19ad150c452c5104cf7dd4d97d79746e5756b6.tar.xz nixlib-be19ad150c452c5104cf7dd4d97d79746e5756b6.tar.zst nixlib-be19ad150c452c5104cf7dd4d97d79746e5756b6.zip | |
Merge pull request #25594 from mimadrid/update/htslib-1.4
Update/htslib 1.4
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/biology/bcftools/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/samtools/default.nix | 9 |
2 files changed, 11 insertions, 9 deletions
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"; |