diff options
| author | Ben Darwin <bcdarwin@gmail.com> | 2020-07-22 15:43:03 -0400 |
|---|---|---|
| committer | Ben Darwin <bcdarwin@gmail.com> | 2020-10-06 15:31:14 -0400 |
| commit | 91a429a148366758bbb36eb71e85c0d9e96d9a5d (patch) | |
| tree | d26ce9fb9e28cd680a8a982fc103493e7051803a /pkgs | |
| parent | 3862e92e01941132b3021ca0fa60927bd95f4d4f (diff) | |
minc_tools: unstable-2019-12-04 -> unstable-2020-07-25
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/biology/minc-tools/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch | 12 |
2 files changed, 4 insertions, 24 deletions
diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index b2029842bbba3..c594897f4b6fd 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -3,28 +3,20 @@ stdenv.mkDerivation rec { pname = "minc-tools"; - version = "unstable-2019-12-04"; + version = "unstable-2020-07-25"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "d4dddfdb4e4fa0cea389b8fdce51cfc076565d94"; - sha256 = "1wwdss59qq4hz1jp35qylfswzzv0d37if23al0srnxkkgc5f8zng"; + rev = "fb0a68a07d281e4e099c5d54df29925240de14c1"; + sha256 = "0zcv2sdj3k6k0xjqdq8j5bxq8smm48dzai90vwsmz8znmbbm6kvw"; }; - patches = [ ./fix-netcdf-header.patch ]; - - # add missing CMake module to build NIFTI support - # (the maintainers normally build libminc and minc-tools in a meta-project) - postPatch = '' - cp ${libminc.src}/cmake-modules/FindNIFTI.cmake cmake-modules - ''; - nativeBuildInputs = [ cmake flex bison makeWrapper ]; buildInputs = [ libminc libjpeg nifticlib zlib ]; propagatedBuildInputs = [ perl TextFormat ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti" "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" ]; diff --git a/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch b/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch deleted file mode 100644 index 89c7564f8b626..0000000000000 --- a/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/progs/mincdump/mincdump.h b/progs/mincdump/mincdump.h -index 14c95cd..117ab26 100644 ---- a/progs/mincdump/mincdump.h -+++ b/progs/mincdump/mincdump.h -@@ -3,6 +3,7 @@ - * See netcdf/COPYRIGHT file for copying and redistribution conditions. - * $Header: /private-cvsroot/minc/progs/mincdump/mincdump.h,v 1.1 2004-04-27 15:35:15 bert Exp $ - *********************************************************************/ -+#include <netcdf_meta.h> - - - /* error checking macro */ |