From 65de1052af0661c77905e6ec1cd6f003983f1f5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 10:22:37 +0200 Subject: [PATCH 1/2] python312Packages.uptime: refactor --- .../python-modules/uptime/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index 7dd3710b81d3..cd9511e82a62 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -1,23 +1,37 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "uptime"; version = "3.0.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; + hash = "sha256-fDACVHdbgHzkbj3LzaMKo7miBLnFenrB557m2+OUKXM="; }; + build-system = [ + setuptools + ]; + + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ + "uptime" + ]; + meta = with lib; { - homepage = "https://github.com/Cairnarvon/uptime"; description = "Cross-platform way to retrieve system uptime and boot time"; + homepage = "https://github.com/Cairnarvon/uptime"; license = licenses.bsd2; maintainers = with maintainers; [ rob ]; }; - } From 81c837e44818480db147006775baa41d4384f39c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 10:23:43 +0200 Subject: [PATCH 2/2] python312Packages.uptime: format with nixfmt --- .../python-modules/uptime/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index cd9511e82a62..d20bd4dc5506 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -1,8 +1,9 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -17,16 +18,12 @@ buildPythonPackage rec { hash = "sha256-fDACVHdbgHzkbj3LzaMKo7miBLnFenrB557m2+OUKXM="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; # Tests are not shipped doCheck = false; - pythonImportsCheck = [ - "uptime" - ]; + pythonImportsCheck = [ "uptime" ]; meta = with lib; { description = "Cross-platform way to retrieve system uptime and boot time";