From 77aba030fdff6ffa226d03d5898c2780047830e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 23:00:44 +0200 Subject: [PATCH 1/2] python312Packages.atomiclong: refactor - migrate to pytestCheckHook - update build-system - add pythonImportsCheck --- .../python-modules/atomiclong/default.nix | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix index 1af61849585b..783cb9386c35 100644 --- a/pkgs/development/python-modules/atomiclong/default.nix +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -1,17 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, cffi }: +{ lib +, buildPythonPackage +, cffi +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "atomiclong"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1gjbc9lvpkgg8vj7dspif1gz9aq4flkhxia16qj6yvb7rp27h4yb"; + hash = "sha256-yxN4xM1nbW8kNkHFDid1BKv0X3Dx6nbkRu/Nu2liS74="; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ cffi ]; + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + dependencies = [ + cffi + ]; + + pythonImportsCheck = [ + "atomiclong" + ]; meta = with lib; { description = "Long data type with atomic operations using CFFI"; From 773847fb13b6333d03ba7f849863d26aa486a0ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 23:01:52 +0200 Subject: [PATCH 2/2] python312Packages.atomiclong: format with nixfmt --- .../python-modules/atomiclong/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix index 783cb9386c35..a5180221fc76 100644 --- a/pkgs/development/python-modules/atomiclong/default.nix +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, cffi -, fetchPypi -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + cffi, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -19,21 +20,13 @@ buildPythonPackage rec { hash = "sha256-yxN4xM1nbW8kNkHFDid1BKv0X3Dx6nbkRu/Nu2liS74="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - dependencies = [ - cffi - ]; + dependencies = [ cffi ]; - pythonImportsCheck = [ - "atomiclong" - ]; + pythonImportsCheck = [ "atomiclong" ]; meta = with lib; { description = "Long data type with atomic operations using CFFI";