From 392fcb14cfac24b7026043e09e03398fce7a7557 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 11 Dec 2015 14:30:21 +0000 Subject: [PATCH] pythonPackages.netcdf4: 1.1.8 -> 1.2.1 --- pkgs/top-level/python-packages.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d84da0312e3c..a2b3a37ce311 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5266,13 +5266,13 @@ in modules // { netcdf4 = buildPythonPackage rec { name = "netCDF4-${version}"; - version = "1.1.8"; + version = "1.2.1"; disabled = isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/netCDF4/${name}.tar.gz"; - sha256 = "0y6s8g82rbij0brh9hz3aapyyq6apj8fpmhhlyibz1354as7rjq1"; + sha256 = "0wzg73zyjjhns4209vrcvh71gs392d16ynz76x3pl1xg2by723iy"; }; propagatedBuildInputs = with self ; [ @@ -5284,13 +5284,12 @@ in modules // { pkgs.libjpeg ]; - patchPhase = '' - export USE_NCCONFIG=0 - export HDF5_DIR="${pkgs.hdf5}" - export NETCDF4_DIR="${pkgs.netcdf}" - export CURL_DIR="${pkgs.curl}" - export JPEG_DIR="${pkgs.libjpeg}" - ''; + # Variables used to configure the build process + USE_NCCONFIG="0"; + HDF5_DIR="${pkgs.hdf5}"; + NETCDF4_DIR="${pkgs.netcdf}"; + CURL_DIR="${pkgs.curl}"; + JPEG_DIR="${pkgs.libjpeg}"; meta = { description = "interface to netCDF library (versions 3 and 4)";