From bc5b13fb432a809eb72e72786ce3e89ff82c9d4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:14:55 +0200 Subject: [PATCH 1/2] python312Packages.looseversion: refactor --- .../python-modules/looseversion/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index b16fd1a572d2..e3e97560a3fc 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -1,33 +1,43 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , hatchling +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "looseversion"; version = "1.3.0"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; + hash = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; - pythonImportsCheck = [ "looseversion" ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ + "looseversion" + ]; meta = with lib; { description = "Version numbering for anarchists and software realists"; homepage = "https://github.com/effigies/looseversion"; + changelog = "https://github.com/effigies/looseversion/blob/${version}/CHANGES.md"; license = licenses.psfl; maintainers = with maintainers; [ pelme ]; }; From 50f0370604721fd995d4af642b8135a3d1751cff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:15:21 +0200 Subject: [PATCH 2/2] python312Packages.looseversion: format with nixfmt --- .../python-modules/looseversion/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index e3e97560a3fc..3bf1553a40d8 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, hatchling -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -18,21 +19,13 @@ buildPythonPackage rec { hash = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; - build-system = [ - hatchling - ]; + build-system = [ hatchling ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - "tests.py" - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "looseversion" - ]; + pytestFlagsArray = [ "tests.py" ]; + + pythonImportsCheck = [ "looseversion" ]; meta = with lib; { description = "Version numbering for anarchists and software realists";