diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:28 +0200 |
| commit | 362d88c2b19e3857576b2571722dc66c381c185a (patch) | |
| tree | 7dc706e1918e7dc1e9762573831c851be4343559 /pkgs/applications/science/biology | |
| parent | 0367fa630d59673624d6742e2758b87eb12fff4c (diff) | |
| parent | 1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e (diff) | |
| download | nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.gz nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.bz2 nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.lz nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.xz nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.zst nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science/biology')
| -rw-r--r-- | pkgs/applications/science/biology/ants/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/bppsuite/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/picard-tools/default.nix | 4 |
3 files changed, 25 insertions, 4 deletions
diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 20eedfaaa16..cb88e92fe1c 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7 }: stdenv.mkDerivation rec { pname = "ANTs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk4 vtk ]; + buildInputs = [ itk4 vtk_7 ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/applications/science/biology/bppsuite/default.nix b/pkgs/applications/science/biology/bppsuite/default.nix new file mode 100644 index 00000000000..564a38708bc --- /dev/null +++ b/pkgs/applications/science/biology/bppsuite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq, bpp-phyl, bpp-popgen }: + +stdenv.mkDerivation rec { + pname = "bppsuite"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "1wdwcgczqbc3m116vakvi0129wm3acln3cfc7ivqnalwvi6lrpds"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core bpp-seq bpp-phyl bpp-popgen ]; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bppsuite/blob/master/ChangeLog"; + }; +} diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 1e678d4b6ed..4b455eaca6f 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.7"; + version = "2.22.8"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "09q66lhjnprkw8azavwzwv9dlhr9b4x0dbz6fym0i2wbhylqp4w6"; + sha256 = "0g387jlf7r1p2kx8gya3vxksbjy3y2ywxa7yjqmxg3y8725fyixl"; }; nativeBuildInputs = [ makeWrapper ]; |