From 5981eaa4aff36bf38fa1b41dacd8c76cb09d0d7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Apr 2024 22:08:42 +0200 Subject: [PATCH 1/2] python312Packages.simplekv: refactor --- pkgs/development/python-modules/simplekv/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix index 12e2449b04c5..cd41d1a6884b 100644 --- a/pkgs/development/python-modules/simplekv/default.nix +++ b/pkgs/development/python-modules/simplekv/default.nix @@ -5,13 +5,14 @@ , mock , pytestCheckHook , pythonOlder +, setuptools , six }: buildPythonPackage rec { pname = "simplekv"; version = "0.14.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,11 @@ buildPythonPackage rec { hash = "sha256-seUGDj2q84+AjDFM1pxMLlHbe9uBgEhmqA96UHjnCmo="; }; - nativeCheckInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ dulwich mock pytestCheckHook From 490494e82deeb8e84d7f18bea0761fb7a9b99566 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Apr 2024 22:08:58 +0200 Subject: [PATCH 2/2] python312Packages.simplekv: format with nixfmt --- .../python-modules/simplekv/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix index cd41d1a6884b..22851e6da57b 100644 --- a/pkgs/development/python-modules/simplekv/default.nix +++ b/pkgs/development/python-modules/simplekv/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, dulwich -, fetchFromGitHub -, mock -, pytestCheckHook -, pythonOlder -, setuptools -, six +{ + lib, + buildPythonPackage, + dulwich, + fetchFromGitHub, + mock, + pytestCheckHook, + pythonOlder, + setuptools, + six, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-seUGDj2q84+AjDFM1pxMLlHbe9uBgEhmqA96UHjnCmo="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ dulwich @@ -34,9 +33,7 @@ buildPythonPackage rec { six ]; - pythonImportsCheck = [ - "simplekv" - ]; + pythonImportsCheck = [ "simplekv" ]; disabledTests = [ # Issue with fixture