Merge pull request #22344 from lsix/update_netcdf

Update netcdf (including python binding)

pkgs/development/libraries/netcdf/default.nix

@@ -9,10 +9,10 @@ let
   mpiSupport = hdf5.mpiSupport;
   mpi = hdf5.mpi;
 in stdenv.mkDerivation rec {
-    name = "netcdf-4.3.3.1";
+    name = "netcdf-4.4.1.1";
     src = fetchurl {
         url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
-        sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx";
+        sha256 = "1blc7ik5yin7i0ls2kag0a9xjk12m0dzx6v1x88az3ras3scci2d";
     };
 
     buildInputs = [ hdf5 m4 curl mpi];

pkgs/development/python-modules/netcdf4.nix

@@ -0,0 +1,36 @@
+{ stdenv, buildPythonPackage, fetchurl, isPyPy
+, numpy, zlib, netcdf, hdf5, curl, libjpeg
+}:
+buildPythonPackage rec {
+  name = "netCDF4-${version}";
+  version = "1.2.7";
+
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
+    sha256 = "1fllizmnpw0zkzzm4j9pgamarlzfn3kmv9zrm0w65q1y31h9ni0c";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    zlib
+    netcdf
+    hdf5
+    curl
+    libjpeg
+  ];
+
+  # Variables used to configure the build process
+  USE_NCCONFIG="0";
+  HDF5_DIR="${hdf5}";
+  NETCDF4_DIR="${netcdf}";
+  CURL_DIR="${curl.dev}";
+  JPEG_DIR="${libjpeg.dev}";
+
+  meta = with stdenv.lib; {
+    description = "Interface to netCDF library (versions 3 and 4)";
+    homepage = https://pypi.python.org/pypi/netCDF4;
+    license = licenses.free;  # Mix of license (all MIT* like)
+  };
+}

pkgs/top-level/python-packages.nix

@@ -8400,39 +8400,7 @@ in {
     };
   };
 
-  netcdf4 = buildPythonPackage rec {
+  netcdf4 = callPackage ../development/python-modules/netcdf4.nix { };
-    name = "netCDF4-${version}";
-    version = "1.2.4";
-
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
-      sha256 = "0lakjix9dhc26f33f03c13ffwspqcrk5j3mnnjczwxbb23ppwwx6";
-    };
-
-    propagatedBuildInputs = with self ; [
-      numpy
-      pkgs.zlib
-      pkgs.netcdf
-      pkgs.hdf5
-      pkgs.curl
-      pkgs.libjpeg
-    ];
-
-    # Variables used to configure the build process
-    USE_NCCONFIG="0";
-    HDF5_DIR="${pkgs.hdf5}";
-    NETCDF4_DIR="${pkgs.netcdf}";
-    CURL_DIR="${pkgs.curl.dev}";
-    JPEG_DIR="${pkgs.libjpeg.dev}";
-
-    meta = {
-      description = "Interface to netCDF library (versions 3 and 4)";
-      homepage = https://pypi.python.org/pypi/netCDF4;
-      license = licenses.free;  # Mix of license (all MIT* like)
-    };
-  };
 
   nxt-python = buildPythonPackage rec {
     version = "unstable-20160819";