netcdf: added parallel i/o support

pkgs/development/libraries/netcdf/default.nix

@@ -1,22 +1,32 @@
-{ stdenv, fetchurl,
+{ stdenv
-  zlib, hdf5, m4,
+, fetchurl
-  curl # for DAP
+, 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 = [
+    buildInputs = [ hdf5 zlib m4 curl mpi];
-        zlib hdf5 m4 curl
+
-    ];
+    passthru = {
+      mpiSupport = mpiSupport;
+      inherit mpi;
+    };
 
     configureFlags = [
         "--enable-netcdf-4"
         "--enable-dap"
         "--enable-shared"
-    ];
+    ]
+    ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" ]);
 }

pkgs/top-level/all-packages.nix

@@ -2549,6 +2549,10 @@ in
 
   netcdf = callPackage ../development/libraries/netcdf { };
  
+  netcdf-mpi = appendToName "mpi" (netcdf.override {
+    hdf5 = hdf5-mpi;
+  });
+
   netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
 
   netcdffortran = callPackage ../development/libraries/netcdf-fortran { };