git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93675 from bcdarwin/update-libminc

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

commita25bd6604f20994a62ce6d323b87c64d4d6fb229 authorLinus Heckemann <git@sphalerite.org> dateWed 7 Oct 2020, 08:08 (6 years ago) parentc7b3d9895439a7
14 files changed+41−138
pkgs/applications/science/biology/EZminc/default.nix+2−2 pkgs/applications/science/biology/N3/default.nix+5−5 pkgs/applications/science/biology/conglomerate/default.nix+5−2 pkgs/applications/science/biology/inormalize/default.nix+1−1 pkgs/applications/science/biology/minc-tools/default.nix+4−12 pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch−12 pkgs/applications/science/biology/mni_autoreg/default.nix+2−2 pkgs/development/libraries/libminc/default.nix+10−10 pkgs/development/libraries/science/biology/EBTKS/default.nix+1−1 pkgs/development/libraries/science/biology/bicgl/default.nix+6−3 pkgs/development/libraries/science/biology/bicpl/default.nix+2−2 pkgs/development/libraries/science/biology/oobicpl/default.nix+2−2 pkgs/tools/misc/hdf5/1_8.nix−75 pkgs/top-level/all-packages.nix+1−9
pkgs/applications/science/biology/EZminc/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "EZminc";
5− name = "${pname}-unstable-2019-03-12";
5+ version = "unstable-2019-03-12";
66
77 src = fetchFromGitHub {
88 owner = "BIC-MNI";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ cmake pkgconfig ];
1515 buildInputs = [ itk4 libminc bicpl fftwFloat gsl ];
1616
17− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/"
17+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"
1818 "-DEZMINC_BUILD_TOOLS=TRUE"
1919 "-DEZMINC_BUILD_MRFSEG=TRUE"
2020 "-DEZMINC_BUILD_DD=TRUE" ];
pkgs/applications/science/biology/N3/default.nix+5−5
@@ -4,20 +4,20 @@
44
55stdenv.mkDerivation rec {
66 pname = "N3";
7− name = "${pname}-2017-09-18";
7+ version = "unstable-2018-08-09";
88
99 src = fetchFromGitHub {
1010 owner = "BIC-MNI";
1111 repo = pname;
12− rev = "2fdd939f0f2b24a4039bc6a8ade4a190a1d8e75d";
13− sha256 = "13z21c4r09hna3q1csvcn4i7ws5ixbdaja6ch421xv6nydjh2w5g";
12+ rev = "010fc2ac58ce1d67b8e6a863fac0809d3203cb9b";
13+ sha256 = "06hci7gzhy8p34ggvx7gah2k9yxpwhgmq1cgw8pcd1r82g4rg6kd";
1414 };
1515
1616 nativeBuildInputs = [ cmake makeWrapper ];
1717 buildInputs = [ libminc EBTKS ];
1818 propagatedBuildInputs = with perlPackages; [ perl MNI-Perllib GetoptTabular ];
1919
20− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ];
20+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${EBTKS}/lib/" ];
2121
2222 postFixup = ''
2323 for p in $out/bin/*; do
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 '';
2727
2828 meta = with stdenv.lib; {
29− homepage = "https://github.com/BIC-MNI/${pname}";
29+ homepage = "https://github.com/BIC-MNI/N3";
3030 description = "MRI non-uniformity correction for MINC files";
3131 maintainers = with maintainers; [ bcdarwin ];
3232 platforms = platforms.unix;
pkgs/applications/science/biology/conglomerate/default.nix+5−2
@@ -3,7 +3,7 @@
33
44stdenv.mkDerivation rec {
55 pname = "conglomerate";
6− name = "${pname}-2017-09-10";
6+ version = "unstable-2017-09-10";
77
88 src = fetchFromGitHub {
99 owner = "BIC-MNI";
@@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
1616 buildInputs = [ libminc zlib bicpl ];
1717 propagatedBuildInputs = [ coreutils minc_tools ] ++ (with perlPackages; [ perl GetoptTabular MNI-Perllib ]);
1818
19− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ];
19+ cmakeFlags = [
20+ "-DLIBMINC_DIR=${libminc}/lib/cmake"
21+ "-DBICPL_DIR=${bicpl}/lib"
22+ ];
2023
2124 postFixup = ''
2225 for p in $out/bin/*; do
pkgs/applications/science/biology/inormalize/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 buildInputs = [ libminc EBTKS ];
2020 propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];
2121
22− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ];
22+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${EBTKS}/lib/" ];
2323
2424 postFixup = ''
2525 for p in $out/bin/*; do
pkgs/applications/science/biology/minc-tools/default.nix+4−12
@@ -3,28 +3,20 @@
33
44stdenv.mkDerivation rec {
55 pname = "minc-tools";
6− version = "unstable-2019-12-04";
6+ version = "unstable-2020-07-25";
77
88 src = fetchFromGitHub {
99 owner = "BIC-MNI";
1010 repo = pname;
11− rev = "d4dddfdb4e4fa0cea389b8fdce51cfc076565d94";
12− sha256 = "1wwdss59qq4hz1jp35qylfswzzv0d37if23al0srnxkkgc5f8zng";
11+ rev = "fb0a68a07d281e4e099c5d54df29925240de14c1";
12+ sha256 = "0zcv2sdj3k6k0xjqdq8j5bxq8smm48dzai90vwsmz8znmbbm6kvw";
1313 };
1414
15− patches = [ ./fix-netcdf-header.patch ];
16−
17− # add missing CMake module to build NIFTI support
18− # (the maintainers normally build libminc and minc-tools in a meta-project)
19− postPatch = ''
20− cp ${libminc.src}/cmake-modules/FindNIFTI.cmake cmake-modules
21− '';
22−
2315 nativeBuildInputs = [ cmake flex bison makeWrapper ];
2416 buildInputs = [ libminc libjpeg nifticlib zlib ];
2517 propagatedBuildInputs = [ perl TextFormat ];
2618
27− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/"
19+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"
2820 "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti"
2921 "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" ];
3022
pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff --git a/progs/mincdump/mincdump.h b/progs/mincdump/mincdump.h
2−index 14c95cd..117ab26 100644
3−--- a/progs/mincdump/mincdump.h
4−+++ b/progs/mincdump/mincdump.h
5−@@ -3,6 +3,7 @@
6− * See netcdf/COPYRIGHT file for copying and redistribution conditions.
7− * $Header: /private-cvsroot/minc/progs/mincdump/mincdump.h,v 1.1 2004-04-27 15:35:15 bert Exp $
8− *********************************************************************/
9−+#include <netcdf_meta.h>
10−
11−
12− /* error checking macro */
pkgs/applications/science/biology/mni_autoreg/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "mni_autoreg";
5− name = "${pname}-2017-09-22";
5+ version = "unstable-2017-09-22";
66
77 src = fetchFromGitHub {
88 owner = "BIC-MNI";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 buildInputs = [ libminc ];
1616 propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];
1717
18− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
18+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ];
1919 # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc
2020
2121 postFixup = ''
pkgs/development/libraries/libminc/default.nix+10−10
@@ -2,15 +2,15 @@
22
33stdenv.mkDerivation rec {
44 pname = "libminc";
5− version = "2.4.03";
5+ version = "unstable-2020-07-17";
66
77 owner = "BIC-MNI";
88
99 src = fetchFromGitHub {
1010 inherit owner;
1111 repo = pname;
12− rev = "release-${version}";
13− sha256 = "0kpmqs9df836ywsqj749qbsfavf5bnldblxrmnmxqq9pywc8yfrm";
12+ rev = "ffb5fb234a852ea7e8da8bb2b3b49f67acbe56ca";
13+ sha256 = "0yr4ksghpvxh9zg0a4p7hvln3qirsi08plvjp5kxx2qiyj96zsdm";
1414 };
1515
1616 postPatch = ''
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
1818 '';
1919
2020 nativeBuildInputs = [ cmake ];
21− buildInputs = [ zlib netcdf nifticlib hdf5 ];
21+ buildInputs = [ zlib nifticlib ];
22+ propagatedBuildInputs = [ netcdf hdf5 ];
2223
2324 cmakeFlags = [
2425 "-DLIBMINC_MINC1_SUPPORT=ON"
@@ -29,17 +30,16 @@ stdenv.mkDerivation rec {
2930 doCheck = !stdenv.isDarwin;
3031 checkPhase = ''
3132 export LD_LIBRARY_PATH="$(pwd)" # see #22060
32− ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure
33− # ezminc_rw_test can't find libminc_io.so.5.2.0; minc_conversion hits netcdf compilation issue
33+ ctest -j1 -E 'ezminc_rw_test' --output-on-failure
34+ # -j1: see https://github.com/BIC-MNI/libminc/issues/110
35+ # ezminc_rw_test: can't find libminc_io.so.5.2.0
3436 '';
3537
36− enableParallelBuilding = true;
37−
3838 meta = with stdenv.lib; {
39− homepage = "https://github.com/${owner}/${pname}";
39+ homepage = "https://github.com/BIC-MNI/libminc";
4040 description = "Medical imaging library based on HDF5";
4141 maintainers = with maintainers; [ bcdarwin ];
4242 platforms = platforms.unix;
43− license = licenses.free;
43+ license = licenses.free;
4444 };
4545}
pkgs/development/libraries/science/biology/EBTKS/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ cmake ];
1515 buildInputs = [ libminc ];
1616
17− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
17+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ];
1818
1919 meta = with stdenv.lib; {
2020 homepage = "https://github.com/BIC-MNI/${pname}";
pkgs/development/libraries/science/biology/bicgl/default.nix+6−3
@@ -2,21 +2,24 @@
22
33stdenv.mkDerivation rec {
44 pname = "bicgl";
5− name = "${pname}-2017-09-10";
5+ version = "unstable-2018-04-06";
66
77 owner = "BIC-MNI";
88
99 src = fetchFromGitHub {
1010 inherit owner;
1111 repo = pname;
12− rev = "b7f7e52d1039d6202a93d9055f516186033656cc";
12+ rev = "61a035751c9244fcca1edf94d6566fa2a709ce90";
1313 sha256 = "0lzirdi1mf4yl8srq7vjn746sbydz7h0wjh7wy8gycy6hq04qrg4";
1414 };
1515
1616 nativeBuildInputs = [ cmake ];
1717 buildInputs = [ libminc bicpl freeglut mesa_glu ];
1818
19− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ];
19+ cmakeFlags = [
20+ "-DLIBMINC_DIR=${libminc}/lib/cmake"
21+ "-DBICPL_DIR=${bicpl}/lib"
22+ ];
2023
2124 meta = with stdenv.lib; {
2225 homepage = "https://github.com/${owner}/${pname}";
pkgs/development/libraries/science/biology/bicpl/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "bicpl";
5− name = "${pname}-2017-09-10";
5+ version = "unstable-2017-09-10";
66
77 owner = "BIC-MNI";
88
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ cmake ];
1818 buildInputs = [ libminc netpbm ];
1919
20− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" ];
20+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ];
2121
2222 doCheck = false;
2323 # internal_volume_io.h: No such file or directory
pkgs/development/libraries/science/biology/oobicpl/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "oobicpl";
5− name = "${pname}-2016-03-02";
5+ version = "unstable-2016-03-02";
66
77 owner = "BIC-MNI";
88
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 nativeBuildInputs = [ cmake ];
1717 buildInputs = [ libminc bicpl arguments pcre-cpp ];
1818
19− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib"
19+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"
2020 "-DBICPL_DIR=${bicpl}/lib"
2121 "-DARGUMENTS_DIR=${arguments}/lib"
2222 "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ];
pkgs/tools/misc/hdf5/1_8.nixdeleted−75
@@ -1,75 +0,0 @@
1−{ stdenv
2−, fetchurl
3−, removeReferencesTo
4−, cpp ? false
5−, gfortran ? null
6−, fortran2003 ? false
7−, zlib ? null
8−, szip ? null
9−, mpi ? null
10−, enableShared ? true
11−}:
12−
13−# cpp and mpi options are mutually exclusive
14−# (--enable-unsupported could be used to force the build)
15−assert !cpp || mpi == null;
16−
17−# Need a Fortran compiler for Fortran2003 bindings
18−assert fortran2003 -> gfortran != null;
19−
20−# No point splitting version 1.8.18 into multiple outputs.
21−# The library /lib/libhdf5.so has a reference to gcc-wrapper
22−
23−let inherit (stdenv.lib) optional optionals; in
24−
25−stdenv.mkDerivation rec {
26− version = "1.8.19";
27− pname = "hdf5";
28− src = fetchurl {
29− url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${pname}-${version}/src/${pname}-${version}.tar.bz2";
30− sha256 = "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r" ;
31− };
32−
33− passthru = {
34− mpiSupport = (mpi != null);
35− inherit mpi;
36− };
37−
38− nativeBuildInputs = [ removeReferencesTo ];
39−
40− buildInputs = []
41− ++ optional (gfortran != null) gfortran
42− ++ optional (szip != null) szip;
43−
44− propagatedBuildInputs = []
45− ++ optional (zlib != null) zlib
46− ++ optional (mpi != null) mpi;
47−
48− configureFlags = []
49− ++ optional cpp "--enable-cxx"
50− ++ optional (gfortran != null) "--enable-fortran"
51− ++ optional fortran2003 "--enable-fortran2003"
52− ++ optional (szip != null) "--with-szlib=${szip}"
53− ++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"]
54− ++ optional enableShared "--enable-shared";
55−
56− patches = [./bin-mv.patch];
57−
58− postInstall = ''
59− find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
60− '';
61−
62− meta = {
63− description = "Data model, library, and file format for storing and managing data";
64− longDescription = ''
65− HDF5 supports an unlimited variety of datatypes, and is designed for flexible and efficient
66− I/O and for high volume and complex data. HDF5 is portable and is extensible, allowing
67− applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and
68− applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
69− '';
70− license = stdenv.lib.licenses.free; # BSD-like
71− homepage = "https://www.hdfgroup.org/HDF5/";
72− platforms = stdenv.lib.platforms.unix;
73− broken = (gfortran != null) && stdenv.isDarwin;
74− };
75−}
pkgs/top-level/all-packages.nix+1−9
@@ -4370,12 +4370,6 @@ in
43704370 mpi = null;
43714371 };
43724372
4373− hdf5_1_8 = callPackage ../tools/misc/hdf5/1_8.nix {
4374− gfortran = null;
4375− szip = null;
4376− mpi = null;
4377− };
4378−
43794373 hdf5-mpi = appendToName "mpi" (hdf5.override {
43804374 szip = null;
43814375 mpi = pkgs.openmpi;
@@ -13927,9 +13921,7 @@ in
1392713921
1392813922 libmilter = callPackage ../development/libraries/libmilter { };
1392913923
13930− libminc = callPackage ../development/libraries/libminc {
13931− hdf5 = hdf5_1_8;
13932− };
13924+ libminc = callPackage ../development/libraries/libminc { };
1393313925
1393413926 libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { };
1393513927