From 7f16302d55f9a2849bcb0859417828f1cfb85812 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 11:27:50 +0000 Subject: [PATCH 1/3] json-schema-for-humans: 0.47 -> 1.0.1 --- .../python-modules/json-schema-for-humans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index f758ae924496..de8f63fea748 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.47"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; - hash = "sha256-yioYsCp+q5YWdIWDlNZkpaLqo++n+dV5jyEeIhUDHr4="; + hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI="; }; pythonRelaxDeps = [ From fe6d7b04bd879d782b172e6efbef502a294b9ea0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 10:02:42 +0200 Subject: [PATCH 2/3] python312Packages.json-schema-for-humans: refactor --- .../python-modules/json-schema-for-humans/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index de8f63fea748..a26e35ce9cbf 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -35,12 +35,15 @@ buildPythonPackage rec { "dataclasses-json" ]; - nativeBuildInputs = [ + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ click dataclasses-json htmlmin @@ -70,10 +73,10 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; - mainProgram = "generate-schema-doc"; homepage = "https://github.com/coveooss/json-schema-for-humans"; changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ astro ]; + mainProgram = "generate-schema-doc"; }; } From 96d18bf71b2ecb971b2cbb92559b6ec66e33a26c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 10:03:13 +0200 Subject: [PATCH 3/3] python312Packages.json-schema-for-humans: format with nixfmt --- .../json-schema-for-humans/default.nix | 51 ++++++++----------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index a26e35ce9cbf..e96a5b37db43 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -1,20 +1,21 @@ -{ lib -, beautifulsoup4 -, buildPythonPackage -, click -, dataclasses-json -, fetchFromGitHub -, htmlmin -, jinja2 -, markdown2 -, poetry-core -, pygments -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pytz -, pyyaml -, requests +{ + lib, + beautifulsoup4, + buildPythonPackage, + click, + dataclasses-json, + fetchFromGitHub, + htmlmin, + jinja2, + markdown2, + poetry-core, + pygments, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pytz, + pyyaml, + requests, }: buildPythonPackage rec { @@ -31,17 +32,11 @@ buildPythonPackage rec { hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI="; }; - pythonRelaxDeps = [ - "dataclasses-json" - ]; + pythonRelaxDeps = [ "dataclasses-json" ]; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ click @@ -67,9 +62,7 @@ buildPythonPackage rec { "TestMdGenerate" ]; - pythonImportsCheck = [ - "json_schema_for_humans" - ]; + pythonImportsCheck = [ "json_schema_for_humans" ]; meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema";