minc-tools: 2.3.00 -> 2.3.01 (develop branch)

This commit is contained in:
Ben Darwin 2017-09-24 18:06:00 -04:00
parent fa2cc0e72f
commit 082b3f1058
2 changed files with 19 additions and 11 deletions

View File

@ -1,23 +1,29 @@
{ stdenv, fetchFromGitHub, perl, cmake, flex, bison, libminc }:
{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, libminc, libjpeg, zlib }:
stdenv.mkDerivation rec {
name = "${pname}-2.3.00";
pname = "minc-tools";
name = "${pname}-2.3.01";
src = fetchFromGitHub {
owner = "BIC-MNI";
repo = pname;
rev = builtins.replaceStrings [ "." ] [ "-" ] name;
sha256 = "0px5paprx4ds9aln3jdg1pywszgyz2aykgkdbj1y8gc1lwcizsl9";
owner = "BIC-MNI";
repo = pname;
rev = "5b7c40425cd4f67a018055cb85c0157ee50a3056";
sha256 = "0zkcs05svp1gj5h0cdgc0k20c7lrk8m7wg3ks3xc5mkaiannj8g7";
};
nativeBuildInputs = [ cmake flex bison ] ++ (if doCheck then [ perl ] else [ ]);
buildInputs = [ libminc ];
nativeBuildInputs = [ cmake flex bison makeWrapper ];
buildInputs = [ libminc libjpeg zlib ];
propagatedBuildInputs = [ perl TextFormat ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
checkPhase = "ctest";
doCheck = false;
checkPhase = "ctest --output-on-failure"; # still some weird test failures though
postFixup = ''
for prog in minccomplete minchistory mincpik; do
wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB
done
'';
enableParallelBuilding = true;

View File

@ -19759,7 +19759,9 @@ with pkgs;
mrbayes = callPackage ../applications/science/biology/mrbayes { };
minc-tools = callPackage ../applications/science/biology/minc-tools { };
minc_tools = callPackage ../applications/science/biology/minc-tools {
inherit (perlPackages) TextFormat;
};
ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };