From ea50ab34f64d82a4bb852eadc21f235ce4f3dced Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 21 May 2024 15:42:58 +0900 Subject: [PATCH 1/2] python311Packages.piep: format with nixfmt --- pkgs/development/python-modules/piep/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index ec3a9f5ec53c..65d96ca5de00 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, pygments -, isPy3k +{ + lib, + buildPythonPackage, + fetchPypi, + nose, + pygments, + isPy3k, }: buildPythonPackage rec { @@ -26,5 +27,4 @@ buildPythonPackage rec { maintainers = with maintainers; [ timbertson ]; license = licenses.gpl3; }; - } From 2482fc8bd116f2c97e4ea82199e743a898d6c0c5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 21 May 2024 15:46:29 +0900 Subject: [PATCH 2/2] python311Packages.piep: refactor and drop nose --- .../python-modules/piep/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index 65d96ca5de00..6fc53f1bec97 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -2,29 +2,34 @@ lib, buildPythonPackage, fetchPypi, - nose, + setuptools, pygments, - isPy3k, + pytestCheckHook, }: buildPythonPackage rec { version = "0.10.0"; - format = "setuptools"; pname = "piep"; - disabled = !isPy3k; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-aM7KQJZr1P0Hs2ReyRj2ItGUo+fRJ+TU3lLAU2Mu8KA="; }; - propagatedBuildInputs = [ pygments ]; - nativeCheckInputs = [ nose ]; + build-system = [ setuptools ]; + + dependencies = [ pygments ]; + + pythonImportsCheck = [ "piep" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Bringing the power of python to stream editing"; homepage = "https://github.com/timbertson/piep"; maintainers = with maintainers; [ timbertson ]; - license = licenses.gpl3; + license = licenses.gpl3Only; + mainProgram = "piep"; }; }