diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 0ac600275fd2..5b7407472592 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -192,7 +192,7 @@ python3Packages.buildPythonApplication rec { pyxlsb qdrant-client rank-bm25 - rapidocr-onnxruntime + rapidocr redis requests restrictedpython diff --git a/pkgs/by-name/ow/owocr/package.nix b/pkgs/by-name/ow/owocr/package.nix index b0900bee6478..8071dccc5e44 100644 --- a/pkgs/by-name/ow/owocr/package.nix +++ b/pkgs/by-name/ow/owocr/package.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { pyjson5 # Google Lens google-cloud-vision manga-ocr - rapidocr-onnxruntime + rapidocr requests # winRT OCR ]; diff --git a/pkgs/development/python-modules/docling-jobkit/default.nix b/pkgs/development/python-modules/docling-jobkit/default.nix index 423c92b124e4..7cfe20ee9478 100644 --- a/pkgs/development/python-modules/docling-jobkit/default.nix +++ b/pkgs/development/python-modules/docling-jobkit/default.nix @@ -19,7 +19,7 @@ # optional dependencies tesserocr, - rapidocr-onnxruntime, + rapidocr, onnxruntime, ray, @@ -68,7 +68,7 @@ buildPythonPackage rec { optional-dependencies = { tesserocr = [ tesserocr ]; rapidocr = [ - rapidocr-onnxruntime + rapidocr onnxruntime ]; ray = [ ray ]; diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix index b8398621e836..6d1074cfff11 100644 --- a/pkgs/development/python-modules/docling-serve/default.nix +++ b/pkgs/development/python-modules/docling-serve/default.nix @@ -16,7 +16,7 @@ websockets, tesserocr, typer, - rapidocr-onnxruntime, + rapidocr, onnxruntime, torch, torchvision, @@ -81,7 +81,7 @@ buildPythonPackage rec { tesserocr ]; rapidocr = [ - rapidocr-onnxruntime + rapidocr onnxruntime ]; cpu = [ diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix index aa0d05259557..783bb524f318 100644 --- a/pkgs/development/python-modules/docling/default.nix +++ b/pkgs/development/python-modules/docling/default.nix @@ -30,7 +30,7 @@ pypdfium2, python-docx, python-pptx, - rapidocr-onnxruntime, + rapidocr, requests, rtree, scipy, @@ -90,7 +90,7 @@ buildPythonPackage rec { pypdfium2 python-docx python-pptx - rapidocr-onnxruntime + rapidocr requests rtree scipy @@ -112,7 +112,7 @@ buildPythonPackage rec { ]; rapidocr = [ onnxruntime - rapidocr-onnxruntime + rapidocr ]; tesserocr = [ tesserocr diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr/default.nix similarity index 97% rename from pkgs/development/python-modules/rapidocr-onnxruntime/default.nix rename to pkgs/development/python-modules/rapidocr/default.nix index 97295a4216b2..85bc9dc958a2 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr/default.nix @@ -41,7 +41,7 @@ let + "/required_for_whl_v1.3.0/resources/models"; in buildPythonPackage { - pname = "rapidocr-onnxruntime"; + pname = "rapidocr"; inherit version src; pyproject = true; @@ -68,7 +68,6 @@ buildPythonPackage { ln -s ${models}/* rapidocr/models - # Magic patch from upstream - what does this even do?? echo "from .rapidocr.main import RapidOCR, VisRes" > __init__.py ''; diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch b/pkgs/development/python-modules/rapidocr/setup-py-override-version-checking.patch similarity index 100% rename from pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch rename to pkgs/development/python-modules/rapidocr/setup-py-override-version-checking.patch diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e49a820de7b6..73ca850bbe65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15553,7 +15553,7 @@ self: super: with self; { rapidgzip = callPackage ../development/python-modules/rapidgzip { inherit (pkgs) nasm; }; - rapidocr-onnxruntime = callPackage ../development/python-modules/rapidocr-onnxruntime { }; + rapidocr = callPackage ../development/python-modules/rapidocr { }; rapt-ble = callPackage ../development/python-modules/rapt-ble { };