diff options
| author | Bruno Bzeznik Bruno.Bzeznik@imag.fr <Bruno.Bzeznik@imag.fr> | 2016-05-26 15:27:04 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-06-05 10:56:14 +0200 |
| commit | 0b3e1f8f7c2abb34ec9d81b6394db7a530911743 (patch) | |
| tree | 1cc8db1fbb04f503d5abcdc3ba60f36474000124 | |
| parent | a03ff26080488d40c4d493aa9386460728fb8fd5 (diff) | |
| download | nixlib-0b3e1f8f7c2abb34ec9d81b6394db7a530911743.tar nixlib-0b3e1f8f7c2abb34ec9d81b6394db7a530911743.tar.gz nixlib-0b3e1f8f7c2abb34ec9d81b6394db7a530911743.tar.bz2 nixlib-0b3e1f8f7c2abb34ec9d81b6394db7a530911743.tar.lz nixlib-0b3e1f8f7c2abb34ec9d81b6394db7a530911743.tar.xz nixlib-0b3e1f8f7c2abb34ec9d81b6394db7a530911743.tar.zst nixlib-0b3e1f8f7c2abb34ec9d81b6394db7a530911743.zip | |
netcdf: added parallel i/o support
| -rw-r--r-- | pkgs/development/libraries/netcdf/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 23 insertions, 9 deletions
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 9659ae5273de..a65b41c02614 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchurl, - zlib, hdf5, m4, - curl # for DAP +{ stdenv +, fetchurl +, zlib +, hdf5 +, m4 +, curl # for DAP }: - -stdenv.mkDerivation rec { + +let + mpiSupport = hdf5.mpiSupport; + mpi = hdf5.mpi; +in stdenv.mkDerivation rec { name = "netcdf-4.3.3.1"; src = fetchurl { url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx"; }; - buildInputs = [ - zlib hdf5 m4 curl - ]; + buildInputs = [ hdf5 zlib m4 curl mpi]; + + passthru = { + mpiSupport = mpiSupport; + inherit mpi; + }; configureFlags = [ "--enable-netcdf-4" "--enable-dap" "--enable-shared" - ]; + ] + ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" ]); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 978148c4e558..17a1c1d855dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2548,6 +2548,10 @@ in netatalk = callPackage ../tools/filesystems/netatalk { }; netcdf = callPackage ../development/libraries/netcdf { }; + + netcdf-mpi = appendToName "mpi" (netcdf.override { + hdf5 = hdf5-mpi; + }); netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; |