From ab77b42008c31c21eec66b7d6ff079a1ed7d12d4 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 8 Jul 2022 11:04:52 +0200 Subject: [PATCH 1/2] python310Packages.h5netcdf: 0.8.1 -> 1.0.1 --- .../python-modules/h5netcdf/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 23a8c4ddcb26..26902e09aaca 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -6,23 +6,21 @@ , pytestCheckHook , netcdf4 , pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "h5netcdf"; - version = "0.8.1"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "09bbnpsvwksb07wijn7flyyza56h5b2g2cw0hb3slmwxz6cgcjmr"; + sha256 = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw="; }; - patches = [ - (fetchpatch{ - url = "https://patch-diff.githubusercontent.com/raw/h5netcdf/h5netcdf/pull/82.patch"; - sha256 = "0x9bq9jl4kvw152adkpcyqslhpi7miv80hrnpl2w2y798mmbs0s4"; - }) - ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ h5py From d56221e143ab92187738ffa613d4a0b65d9db7b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Jul 2022 11:01:09 +0200 Subject: [PATCH 2/2] python310Packages.h5netcdf: add pythonImportsCheck --- .../python-modules/h5netcdf/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 26902e09aaca..7afa664c1a85 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -12,10 +12,13 @@ buildPythonPackage rec { pname = "h5netcdf"; version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw="; + hash = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw="; }; nativeBuildInputs = [ @@ -31,14 +34,16 @@ buildPythonPackage rec { netcdf4 ]; - disabled = pythonOlder "3.6"; - dontUseSetuptoolsCheck = true; - meta = { + pythonImportsCheck = [ + "h5netcdf" + ]; + + meta = with lib; { description = "netCDF4 via h5py"; homepage = "https://github.com/shoyer/h5netcdf"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - }