From 73d46a9a7ee5a1193252bc4b1473d1e7243af131 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Jun 2023 14:24:55 +0000 Subject: [PATCH 1/4] python310Packages.typepy: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/typepy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index b0a505e3205b..2b3b70c8d6bf 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "typepy"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-J6SgVd2m0wOVr2ZV/pryRcJrn+BYTGstAUQO349c2lE="; + rev = "refs/tags/v${version}"; + hash = "sha256-cgy1+6RZ1DUyH45bAKpGPOOZCwhCUghummw2fnfJGww="; }; propagatedBuildInputs = [ mbstrdecoder python-dateutil pytz packaging ]; From 10549898743de632c6947eba7562d00a98c2669b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jun 2023 20:34:48 +0200 Subject: [PATCH 2/4] python310Packages.typepy: add changelog to meta --- pkgs/development/python-modules/typepy/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index 2b3b70c8d6bf..8cb1970f0197 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -1,6 +1,6 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , mbstrdecoder , python-dateutil , pytz @@ -26,9 +26,10 @@ buildPythonPackage rec { checkInputs = [ tcolorpy ]; meta = with lib; { + description = "Library for variable type checker/validator/converter at a run time"; homepage = "https://github.com/thombashi/typepy"; - description = "A library for variable type checker/validator/converter at a run time"; - maintainers = with maintainers; [ genericnerdyusername ]; + changelog = "https://github.com/thombashi/typepy/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ genericnerdyusername ]; }; } From 20efb1b60450bc8ac38d9cafb789300e5ae70ff1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jun 2023 20:37:00 +0200 Subject: [PATCH 3/4] python310Packages.typepy: add format - disable on unsupported Python releases --- pkgs/development/python-modules/typepy/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index 8cb1970f0197..cdc6920574b6 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -6,12 +6,16 @@ , pytz , packaging , pytestCheckHook +, pythonOlder , tcolorpy }: buildPythonPackage rec { pname = "typepy"; version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; From 9af11af665d0f7a37235698df8306092e2cc3bcc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jun 2023 20:40:46 +0200 Subject: [PATCH 4/4] python310Packages.typepy: combine inputs --- pkgs/development/python-modules/typepy/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index cdc6920574b6..a1d9e7df1534 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -24,10 +24,17 @@ buildPythonPackage rec { hash = "sha256-cgy1+6RZ1DUyH45bAKpGPOOZCwhCUghummw2fnfJGww="; }; - propagatedBuildInputs = [ mbstrdecoder python-dateutil pytz packaging ]; + propagatedBuildInputs = [ + mbstrdecoder + python-dateutil + pytz + packaging + ]; - nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ tcolorpy ]; + nativeCheckInputs = [ + pytestCheckHook + tcolorpy + ]; meta = with lib; { description = "Library for variable type checker/validator/converter at a run time";