From d3dcff9761e9c8a847b402bb951ea134fd9f2c08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Dec 2020 08:47:19 +0000 Subject: [PATCH 1/2] python37Packages.netcdf4: 1.5.4 -> 1.5.5 --- pkgs/development/python-modules/netcdf4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 874ca53d34f..432603d6205 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.4"; + version = "1.5.5"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "941de6f3623b6474ecb4d043be5990690f7af4cf0d593b31be912627fe5aad03"; + sha256 = "910b0c9d1ca7bef9c5796c45e2f5f30b91df70997ac655c51a58073eff2634f9"; }; checkInputs = [ pytest ]; From 45fa57992b4b416d2f59ac3e545f8683e901371d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Dec 2020 16:40:24 +0100 Subject: [PATCH 2/2] pythonPackages.h5netcdf: Fix test issues with h5py >= 3.0 --- pkgs/development/python-modules/h5netcdf/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 316c5bc4d48..23a8c4ddcb2 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , h5py , pytestCheckHook , netcdf4 @@ -16,6 +17,13 @@ buildPythonPackage rec { sha256 = "09bbnpsvwksb07wijn7flyyza56h5b2g2cw0hb3slmwxz6cgcjmr"; }; + patches = [ + (fetchpatch{ + url = "https://patch-diff.githubusercontent.com/raw/h5netcdf/h5netcdf/pull/82.patch"; + sha256 = "0x9bq9jl4kvw152adkpcyqslhpi7miv80hrnpl2w2y798mmbs0s4"; + }) + ]; + propagatedBuildInputs = [ h5py ];