libminc: unstable-2020-07-17 -> 2.4.05

- hdf5_1_10 -> hdf5
- enable previously erroring test

+7 -9
+6 -6
pkgs/development/libraries/libminc/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libminc"; 5 - version = "unstable-2020-07-17"; 5 + version = "2.4.05"; 6 6 7 7 owner = "BIC-MNI"; 8 8 9 9 src = fetchFromGitHub { 10 10 inherit owner; 11 11 repo = pname; 12 - rev = "ffb5fb234a852ea7e8da8bb2b3b49f67acbe56ca"; 13 - sha256 = "0yr4ksghpvxh9zg0a4p7hvln3qirsi08plvjp5kxx2qiyj96zsdm"; 12 + rev = "aa08255f0856e70fb001c5f9ee1f4e5a8c12d47d"; # new release, but no git tag 13 + sha256 = "XMTO6/HkyrrQ0s5DzJLCmmWheye2DGMnpDbcGdP6J+A="; 14 14 }; 15 15 16 16 postPatch = '' ··· 24 24 cmakeFlags = [ 25 25 "-DLIBMINC_MINC1_SUPPORT=ON" 26 26 "-DLIBMINC_BUILD_SHARED_LIBS=ON" 27 + "-DLIBMINC_USE_NIFTI=ON" 27 28 "-DLIBMINC_USE_SYSTEM_NIFTI=ON" 28 29 ]; 29 30 30 31 doCheck = !stdenv.isDarwin; 32 + # -j1: see https://github.com/BIC-MNI/libminc/issues/110 31 33 checkPhase = '' 32 - ctest -j1 -E 'ezminc_rw_test' --output-on-failure 33 - # -j1: see https://github.com/BIC-MNI/libminc/issues/110 34 - # ezminc_rw_test: can't find libminc_io.so.5.2.0 34 + ctest -j1 --output-on-failure 35 35 ''; 36 36 37 37 meta = with lib; {
+1 -3
pkgs/top-level/all-packages.nix
··· 19440 19440 19441 19441 libmilter = callPackage ../development/libraries/libmilter { }; 19442 19442 19443 - libminc = callPackage ../development/libraries/libminc { 19444 - hdf5 = hdf5_1_10; 19445 - }; 19443 + libminc = callPackage ../development/libraries/libminc { }; 19446 19444 19447 19445 libmkv = callPackage ../development/libraries/libmkv { }; 19448 19446