From 96867fbe27f62d384092a2b98b4f989d034a95b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 20:56:07 +0200 Subject: [PATCH 1/2] python312Packages.hickle: refactor --- pkgs/development/python-modules/hickle/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 7298102fea84..9f39049eed5d 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -9,12 +9,13 @@ , scipy , pandas , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "hickle"; version = "5.0.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -25,10 +26,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tox.ini \ - --replace "--cov=./hickle" "" + --replace-fail "--cov=./hickle" "" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ dill h5py numpy From ed3d62c04cdb0b5b97d0610b6b3557eac11aefa4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 20:56:39 +0200 Subject: [PATCH 2/2] python312Packages.hickle: format with nixfmt --- .../python-modules/hickle/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 9f39049eed5d..ec802955c0d3 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, h5py -, numpy -, dill -, astropy -, scipy -, pandas -, pytestCheckHook -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + h5py, + numpy, + dill, + astropy, + scipy, + pandas, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { @@ -29,9 +30,7 @@ buildPythonPackage rec { --replace-fail "--cov=./hickle" "" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ dill @@ -46,9 +45,7 @@ buildPythonPackage rec { scipy ]; - pythonImportsCheck = [ - "hickle" - ]; + pythonImportsCheck = [ "hickle" ]; disabledTests = [ # broken in 5.0.2 with recent NumPy