public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- propagate hdf5 and netcdf since essentially every reverse dep of libminc depends on these
- switch to default HDF5 from 1.8.x series
- one resolved test failure and one new error (less concerning than before)
This commit is contained in:
Ben Darwin 2020-07-22 15:21:40 -04:00
parent fd74ab37b0
commit 3862e92e01
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/libminc/default.nix
View File

@ -2,15 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libminc"; pname = "libminc";
version = "2.4.03"; version = "unstable-2020-07-17";
owner = "BIC-MNI"; owner = "BIC-MNI";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner; inherit owner;
repo = pname; repo = pname;
rev = "release-${version}"; rev = "ffb5fb234a852ea7e8da8bb2b3b49f67acbe56ca";
sha256 = "0kpmqs9df836ywsqj749qbsfavf5bnldblxrmnmxqq9pywc8yfrm"; sha256 = "0yr4ksghpvxh9zg0a4p7hvln3qirsi08plvjp5kxx2qiyj96zsdm";
}; };
postPatch = '' postPatch = ''
@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ zlib netcdf nifticlib hdf5 ]; buildInputs = [ zlib nifticlib ];
propagatedBuildInputs = [ netcdf hdf5 ];
cmakeFlags = [ cmakeFlags = [
"-DLIBMINC_MINC1_SUPPORT=ON" "-DLIBMINC_MINC1_SUPPORT=ON"
@ -29,14 +30,13 @@ stdenv.mkDerivation rec {
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
checkPhase = '' checkPhase = ''
export LD_LIBRARY_PATH="$(pwd)" # see #22060 export LD_LIBRARY_PATH="$(pwd)" # see #22060
ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure ctest -j1 -E 'ezminc_rw_test' --output-on-failure
# ezminc_rw_test can't find libminc_io.so.5.2.0; minc_conversion hits netcdf compilation issue # -j1: see https://github.com/BIC-MNI/libminc/issues/110
# ezminc_rw_test: can't find libminc_io.so.5.2.0
''; '';
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/${owner}/${pname}"; homepage = "https://github.com/BIC-MNI/libminc";
description = "Medical imaging library based on HDF5"; description = "Medical imaging library based on HDF5";
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.unix; platforms = platforms.unix;

4
pkgs/top-level/all-packages.nix
View File

@ -13923,9 +13923,7 @@ in
libmilter = callPackage ../development/libraries/libmilter { }; libmilter = callPackage ../development/libraries/libmilter { };
libminc = callPackage ../development/libraries/libminc { libminc = callPackage ../development/libraries/libminc { };
hdf5 = hdf5_1_8;
};
libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { };