From ba3b525b28a6533dcde91644cd4415540012fd09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 13:52:12 +0200 Subject: [PATCH 1/2] python312Packages.nanotime: refactor --- .../python-modules/nanotime/default.nix | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/nanotime/default.nix b/pkgs/development/python-modules/nanotime/default.nix index aeabc540eb00..184fc82158e5 100644 --- a/pkgs/development/python-modules/nanotime/default.nix +++ b/pkgs/development/python-modules/nanotime/default.nix @@ -1,24 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pythonOlder +}: buildPythonPackage rec { pname = "nanotime"; version = "0.5.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c7cc231fc5f6db401b448d7ab51c96d0a4733f4b69fabe569a576f89ffdf966b"; + hash = "sha256-x8wjH8X220AbRI16tRyW0KRzP0tp+r5Wmldvif/flms="; }; - nativeCheckInputs = [ nose ]; + build-system = [ + setuptools + ]; - checkPhase = '' - nosetests - ''; - - # tests currently fail + # Tests currently failing + # https://github.com/jbenet/nanotime/issues/2 doCheck = false; + pythonImportsCheck = [ + "nanotime" + ]; + meta = with lib; { description = "Provides a time object that keeps time as the number of nanoseconds since the UNIX epoch"; homepage = "https://github.com/jbenet/nanotime/tree/master/python"; From c234e8bbcf7696499a5c46ad2216156ea72a4f21 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 13:52:31 +0200 Subject: [PATCH 2/2] python312Packages.nanotime: format with nixfmt --- .../python-modules/nanotime/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/nanotime/default.nix b/pkgs/development/python-modules/nanotime/default.nix index 184fc82158e5..d41126916b0b 100644 --- a/pkgs/development/python-modules/nanotime/default.nix +++ b/pkgs/development/python-modules/nanotime/default.nix @@ -1,8 +1,9 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pythonOlder, }: buildPythonPackage rec { @@ -17,17 +18,13 @@ buildPythonPackage rec { hash = "sha256-x8wjH8X220AbRI16tRyW0KRzP0tp+r5Wmldvif/flms="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; # Tests currently failing # https://github.com/jbenet/nanotime/issues/2 doCheck = false; - pythonImportsCheck = [ - "nanotime" - ]; + pythonImportsCheck = [ "nanotime" ]; meta = with lib; { description = "Provides a time object that keeps time as the number of nanoseconds since the UNIX epoch";