From c2f62b686eb6b66ecbdc481f551e833ec48e84ea Mon Sep 17 00:00:00 2001 From: puzzlewolf Date: Fri, 20 Jun 2025 13:19:49 +0200 Subject: [PATCH 1/2] python313Packages.html2pdf4doc: init at 0.0.20 --- .../python-modules/html2pdf4doc/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/html2pdf4doc/default.nix diff --git a/pkgs/development/python-modules/html2pdf4doc/default.nix b/pkgs/development/python-modules/html2pdf4doc/default.nix new file mode 100644 index 000000000000..6e59066f3e4d --- /dev/null +++ b/pkgs/development/python-modules/html2pdf4doc/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + requests, + selenium, + versionCheckHook, + webdriver-manager, +}: + +buildPythonPackage rec { + pname = "html2pdf4doc"; + version = "0.0.20"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mettta"; + repo = "html2pdf4doc_python"; + tag = version; + hash = "sha256-VFNM66NbApB6qrmK5j0MaqkD4Riwzo7Cy6XjPW6/4lc="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + requests + selenium + webdriver-manager + ]; + + pythonImportsCheck = [ "html2pdf4doc" ]; + + nativeCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = "-v"; + + meta = { + description = "Print HTML to PDF in the Browser – Python Package for HTML2PDF.js"; + homepage = "https://github.com/mettta/html2pdf4doc_python"; + changelog = "https://github.com/mettta/html2pdf4doc_python/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ puzzlewolf ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 894f42820284..b9e96318465f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6587,6 +6587,8 @@ self: super: with self; { html2image = callPackage ../development/python-modules/html2image { }; + html2pdf4doc = callPackage ../development/python-modules/html2pdf4doc { }; + html2text = callPackage ../development/python-modules/html2text { }; html5-parser = callPackage ../development/python-modules/html5-parser { }; From 0a82d5d266d67bfc45c425cb15c6acdcd09bbb0f Mon Sep 17 00:00:00 2001 From: puzzlewolf Date: Fri, 20 Jun 2025 13:23:07 +0200 Subject: [PATCH 2/2] strictdoc: 0.0.58 -> 0.9.3 --- pkgs/by-name/st/strictdoc/package.nix | 33 +++++++++++++++------------ 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index 3427cfc838cb..60dee552dbf3 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -6,41 +6,48 @@ python3.pkgs.buildPythonApplication rec { pname = "strictdoc"; - version = "0.0.58"; + version = "0.9.3"; pyproject = true; src = fetchFromGitHub { owner = "strictdoc-project"; repo = "strictdoc"; tag = version; - hash = "sha256-0X74Lv25pUdOUgQzqQU6p+fjuxhC/JqfKEFI7c5t67U="; + hash = "sha256-3bZfyjylNrCK2UFXgCoNI/LckSa8FkVWD/kBopFIbec="; }; - nativeBuildInputs = [ + build-system = [ python3.pkgs.hatchling ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ beautifulsoup4 + datauri docutils fastapi graphviz + html2pdf4doc html5lib jinja2 + lark lxml + openpyxl pybtex pygments - datauri python-multipart - selenium - requests - spdx-tools - webdriver-manager reqif + requests + robotframework + selenium setuptools + spdx-tools textx toml + tree-sitter + tree-sitter-grammars.tree-sitter-cpp + tree-sitter-grammars.tree-sitter-python uvicorn + webdriver-manager websockets xlrd xlsxwriter @@ -60,18 +67,16 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "python-datauri" "xlsxwriter" - "lxml" - "textx" ]; pythonImportsCheck = [ "strictdoc" ]; - meta = with lib; { + meta = { description = "Software for technical documentation and requirements management"; homepage = "https://github.com/strictdoc-project/strictdoc"; changelog = "https://github.com/strictdoc-project/strictdoc/blob/${src.rev}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ yuu ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yuu ]; mainProgram = "strictdoc"; }; }