diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-12-17 08:41:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 08:41:38 -0500 |
| commit | 07536907412148b7a15a5805459a1bad7f28eec4 (patch) | |
| tree | 3ca0220f0b59593687b1d1acccbaebe8f4fa3217 /pkgs/development/libraries | |
| parent | d6cf13844406d2044c3c6e9f3875c4d1af43bd38 (diff) | |
| parent | 52d15ab28b3044ac7adf9acb222a5455b8b0158d (diff) | |
| download | nixpkgs-07536907412148b7a15a5805459a1bad7f28eec4.tar nixpkgs-07536907412148b7a15a5805459a1bad7f28eec4.tar.gz nixpkgs-07536907412148b7a15a5805459a1bad7f28eec4.tar.bz2 nixpkgs-07536907412148b7a15a5805459a1bad7f28eec4.tar.lz nixpkgs-07536907412148b7a15a5805459a1bad7f28eec4.tar.xz nixpkgs-07536907412148b7a15a5805459a1bad7f28eec4.tar.zst nixpkgs-07536907412148b7a15a5805459a1bad7f28eec4.zip | |
Merge pull request #75391 from bcdarwin/update-libminc
libminc: 2018-01-17 -> 2.4.03 and disable broken checkPhase on OSX
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libminc/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index aea7a5959fa..53b6af40b51 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -1,17 +1,16 @@ { stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }: stdenv.mkDerivation rec { - pname = "libminc"; - name = "${pname}-2018-01-17"; + pname = "libminc"; + version = "2.4.03"; owner = "BIC-MNI"; - # current master is significantly ahead of most recent release, so use Git version: src = fetchFromGitHub { inherit owner; repo = pname; - rev = "a9cbe1353eae9791b7d5b03af16e0f86922ce40b"; - sha256 = "0mn4n3ihzcr1jw2g1vy6c8p4lkc88jwljk04argmj7k4djrgpxpa"; + rev = "release-${version}"; + sha256 = "0kpmqs9df836ywsqj749qbsfavf5bnldblxrmnmxqq9pywc8yfrm"; }; postPatch = '' @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { "-DLIBMINC_USE_SYSTEM_NIFTI=ON" ]; - doCheck = true; + doCheck = !stdenv.isDarwin; checkPhase = '' export LD_LIBRARY_PATH="$(pwd)" # see #22060 ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure |