From b362f100ac6b0f4d0d20722478b48d91a84357a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Oct 2022 15:31:14 +0000 Subject: [PATCH 1/3] python310Packages.clize: 4.2.1 -> 5.0.0 --- pkgs/development/python-modules/clize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index f1e5b16320b6..003b78bbe229 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "clize"; - version = "4.2.1"; + version = "5.0.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "3177a028e4169d8865c79af82bdd441b24311d4bd9c0ae8803641882d340a51d"; + sha256 = "sha256-/cFpEvAN/Movd38xaE53Y+D9EYg/SFyHeqtlVUo1D0I="; }; postPatch = '' From 0492580befa44c58e63c36d48ea99049c996d6f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Oct 2022 19:00:39 +0200 Subject: [PATCH 2/3] python310Packages.clize: remove postPatch - disable on older Python releases --- .../python-modules/clize/default.nix | 38 +++++++------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 003b78bbe229..c4e87fffe4da 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -1,24 +1,15 @@ { lib -, buildPythonPackage -, fetchPypi - -# build -, setuptools - -# propagtes -, sigtools -, six , attrs -, od +, buildPythonPackage , docutils - -# extras: datetime -, python-dateutil - -# tests +, fetchPypi +, od , pygments -, unittest2 , pytestCheckHook +, python-dateutil +, setuptools +, sigtools +, unittest2 }: buildPythonPackage rec { @@ -26,17 +17,13 @@ buildPythonPackage rec { version = "5.0.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-/cFpEvAN/Movd38xaE53Y+D9EYg/SFyHeqtlVUo1D0I="; + hash = "sha256-/cFpEvAN/Movd38xaE53Y+D9EYg/SFyHeqtlVUo1D0I="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "docutils ~= 0.17.0" "docutils" \ - --replace "attrs>=19.1.0,<22" "attrs>=19.1.0" - ''; - nativeBuildInputs = [ setuptools ]; @@ -46,7 +33,6 @@ buildPythonPackage rec { docutils od sigtools - six ]; passthru.optional-dependencies = { @@ -65,7 +51,9 @@ buildPythonPackage rec { unittest2 ]; - pythonImportsCheck = [ "clize" ]; + pythonImportsCheck = [ + "clize" + ]; meta = with lib; { description = "Command-line argument parsing for Python"; From c44448888c840de947d19f33839c13f8ffc508d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Oct 2022 19:03:38 +0200 Subject: [PATCH 3/3] python310Packages.clize: add missing input --- pkgs/development/python-modules/clize/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index c4e87fffe4da..a78b55704aec 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -6,6 +6,7 @@ , od , pygments , pytestCheckHook +, pythonOlder , python-dateutil , setuptools , sigtools