From 8a48222ce98ba3d3d69bdabf1f516764ef290058 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 08:30:14 +0100 Subject: [PATCH 1/3] python310Packages.argcomplete: update ordering and style --- .../python-modules/argcomplete/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 12fd0fbd5a3e..c1ffee25db7c 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib , pexpect }: @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cuCDQIUtMlREWcDBmq0bSKosOpbejG5XQkVrT1OMpS8="; + hash = "sha256-cuCDQIUtMlREWcDBmq0bSKosOpbejG5XQkVrT1OMpS8="; }; postPatch = '' @@ -19,19 +19,21 @@ buildPythonPackage rec { --replace " + lint_require" "" ''; - # tries to build and install test packages which fails - doCheck = false; - propagatedBuildInputs = [ pexpect ]; - pythonImportsCheck = [ "argcomplete" ]; + # tries to build and install test packages which fails + doCheck = false; + + pythonImportsCheck = [ + "argcomplete" + ]; meta = with lib; { description = "Bash tab completion for argparse"; homepage = "https://kislyuk.github.io/argcomplete/"; - maintainers = [ maintainers.womfoo ]; - license = [ licenses.asl20 ]; + license = licenses.asl20; + maintainers = with maintainers; [ womfoo ]; }; } From c921484a9814523da13327b359fd31ca321d0797 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 08:31:41 +0100 Subject: [PATCH 2/3] python310Packages.argcomplete: add changelog to meta --- pkgs/development/python-modules/argcomplete/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index c1ffee25db7c..260e26d0f38a 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bash tab completion for argparse"; homepage = "https://kislyuk.github.io/argcomplete/"; + changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; license = licenses.asl20; maintainers = with maintainers; [ womfoo ]; }; From d9925fdefa3ff6324109cc82464c1c0659490ef5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 08:33:30 +0100 Subject: [PATCH 3/3] python310Packages.argcomplete: disable on unsupported Python releases --- pkgs/development/python-modules/argcomplete/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 260e26d0f38a..9725d8b92bd8 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -2,11 +2,15 @@ , buildPythonPackage , fetchPypi , pexpect +, pythonOlder }: buildPythonPackage rec { pname = "argcomplete"; version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version;