Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 408d06f6ec7f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be19ad150c45
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on May 7, 2017

  1. htslib: 1.3.2 -> 1.4

    mimadrid committed May 7, 2017
    Copy the full SHA
    295a23a View commit details

  2. samtools: 1.3.1 -> 1.4

    mimadrid committed May 7, 2017
    Copy the full SHA
    9073e67 View commit details

Commits on May 11, 2017

  1. bcftools: 1.3.1 -> 1.4

    @Mic92
    mimadrid authored and Mic92 committed May 11, 2017
    Copy the full SHA
    8d1bebf View commit details

  2. Merge pull request #25594 from mimadrid/update/htslib-1.4 

    Update/htslib 1.4
    @Mic92
    Mic92 authored May 11, 2017
    Copy the full SHA
    be19ad1 View commit details
11 changes: 6 additions & 5 deletions pkgs/applications/science/biology/bcftools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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}"
9 changes: 5 additions & 4 deletions pkgs/applications/science/biology/samtools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
15 changes: 10 additions & 5 deletions pkgs/development/libraries/science/biology/htslib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";