diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-26 18:01:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-26 18:01:21 +0000 |
commit | 607cdcc471cb69a6fe4eb001dbe1b31f2db526fd (patch) | |
tree | 3a3746208e448921eb51133062fb71b8eef0f290 /pkgs/development | |
parent | e6f06c8dc6e38a68b9088c9995656fc0bdeaa975 (diff) | |
parent | d50918bc1c43dea8fd5282dcaca3ebc7144e210f (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
38 files changed, 491 insertions, 163 deletions
diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 79945e81af25f..c419b7f30411f 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-pd/ZkDpzlheEJfX7X6fFWY4Y5B5Y2EnJMBtuNHPuUJw="; + hash = "sha256-LVMwDoGR516rwNhhvibu7g4EsaG2O8WOb+Ja+nCQA+k="; fetchSubmodules = true; }; in @@ -21,7 +21,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-yxcUljclKKVFbY6iUphnTUSqMPpsEiPcw4yUs6atU0c="; + hash = "sha256-yq2shufOZsTyg8iBGsRrAs6bC3iAa9vtUeS96c5xJl0="; }; # elixir-ls is an umbrella app diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 3ef2831a72e88..db815c281609b 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -1,6 +1,10 @@ { lib, fetchFromGitHub, ocamlPackages }: -with ocamlPackages; buildDunePackage rec { +let + inherit (ocamlPackages) buildDunePackage js_of_ocaml menhir; +in + +buildDunePackage rec { pname = "eff"; version = "5.1"; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index c17f2df97fa2c..81459f8f32ae0 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -25,24 +25,24 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "23.1.0"; + version = "23.2.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "esphome"; - repo = pname; + repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-1Y2hcgvn0Msx17t1sH5N8cg2wmYo6YqFWPUqUNTNN5M="; + hash = "sha256-GFQ87Ic0xHXs8ZgmzH7kOFbDSNmtj0hx+YHKnrz/sG0="; }; - nativeBuildInputs = [ + build-system = [ setuptools cython_3 ]; - propagatedBuildInputs = [ + dependencies = [ aiohappyeyeballs async-interrupt chacha20poly1305-reuseable diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index f2c2ce7958f11..c42ebffad538d 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -2,16 +2,12 @@ , buildPythonPackage , fetchFromGitHub , setuptools -, sphinx , hypothesis -, py , pytest-xdist , pytestCheckHook -, pytest-benchmark -, sortedcollections -, sortedcontainers , typing-extensions , pythonOlder +, wheel }: buildPythonPackage rec { @@ -19,7 +15,7 @@ buildPythonPackage rec { version = "0.23.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jab"; @@ -28,31 +24,31 @@ buildPythonPackage rec { hash = "sha256-WE0YaRT4a/byvU2pzcByuf1DfMlOpYA9i0PPrKXsS+M="; }; - nativeBuildInputs = [ + build-system = [ setuptools - ]; - - propagatedBuildInputs = [ - sphinx + wheel ]; nativeCheckInputs = [ hypothesis - py pytest-xdist pytestCheckHook - pytest-benchmark - sortedcollections - sortedcontainers typing-extensions ]; + pytestFlagsArray = [ + # Pass -c /dev/null so that pytest does not use the bundled pytest.ini, which adds + # options to run additional integration tests that are overkill for our purposes. + "-c" + "/dev/null" + ]; + pythonImportsCheck = [ "bidict" ]; meta = with lib; { - homepage = "https://github.com/jab/bidict"; - changelog = "https://github.com/jab/bidict/blob/v${version}/CHANGELOG.rst"; - description = "Efficient, Pythonic bidirectional map data structures and related functionality"; + homepage = "https://bidict.readthedocs.io"; + changelog = "https://bidict.readthedocs.io/changelog.html"; + description = "The bidirectional mapping library for Python."; license = licenses.mpl20; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index a3d2f9a99e627..e792f1e6bf939 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.69"; + version = "1.34.70"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k/tPhkDNAacOnTyUOVxn+2GX9eZiPS858YNXtbmtvfw="; + hash = "sha256-WlF4VNAeHKXYEX7NYP0Ehw9uuRAI+tZ13Wr/NinzF7U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index a6a28221ce66c..54faa5fd47c81 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -17,13 +17,14 @@ , rich , schema , setuptools +, tabulate , tqdm , tritonclient }: buildPythonPackage rec { pname = "clarifai"; - version = "10.1.1"; + version = "10.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-36XceC40cL0SywY0Mus/s8OCO0ujWqxEIKZW+fvd7lw="; + hash = "sha256-jI85xMApeEd0Hl6h4Am5qxWoSSTWHsmb7FxUjJPmBQM="; }; pythonRelaxDeps = [ @@ -43,12 +44,12 @@ buildPythonPackage rec { "opencv-python" ]; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook setuptools ]; - propagatedBuildInputs = [ + dependencies = [ clarifai-grpc inquirerpy llama-index-core @@ -60,6 +61,7 @@ buildPythonPackage rec { pyyaml rich schema + tabulate tqdm tritonclient ]; @@ -87,6 +89,7 @@ buildPythonPackage rec { # Tests require network access and API key "tests/test_app.py" "tests/test_data_upload.py" + "tests/test_eval.py" "tests/test_model_predict.py" "tests/test_model_train.py" "tests/test_search.py" @@ -102,10 +105,10 @@ buildPythonPackage rec { meta = with lib; { description = "Clarifai Python Utilities"; - mainProgram = "clarifai"; homepage = "https://github.com/Clarifai/clarifai-python"; changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ natsukium ]; + mainProgram = "clarifai"; }; } diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index 4339f69183049..38b83c7b131f7 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "duo-client"; - version = "5.2.0"; + version = "5.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,20 +21,20 @@ buildPythonPackage rec { owner = "duosecurity"; repo = "duo_client_python"; rev = "refs/tags/${version}"; - hash = "sha256-MnSAFxKgExq+e8TOwgsPAoO4GEfsc3sjPNGLxzch5f0="; + hash = "sha256-7cifxNSBHbX7QZ52Sy1hm5xzZYcLZOkloT6q9P7TO6A="; }; postPatch = '' substituteInPlace requirements-dev.txt \ - --replace "dlint" "" \ - --replace "flake8" "" + --replace-fail "dlint" "" \ + --replace-fail "flake8" "" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ six ]; diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 8ad76a907581b..2c3abd4c0e785 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, gitUpdater , pythonOlder , pythonRelaxDepsHook # pyproject @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "0.10.1"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,9 +37,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; - rev = "refs/tags/gradio_client@${version}"; + rev = "refs/tags/@gradio/client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-cRsYqNMmzuybJI823lpUOmNcTdcTO8dJkp3cpjATZQU="; + hash = "sha256-7oC/Z3YUiOFZdv/60q7PkfluV77broRkHgWiY9Vim9Y="; }; prePatch = '' cd client/python @@ -95,6 +96,8 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + passthru.updateScript = gitUpdater { rev-prefix = "@gradio/client@"; }; + meta = with lib; { homepage = "https://www.gradio.app/"; description = "Lightweight library to use any Gradio app as an API"; diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index bfcf10a2ea1ce..69e57b821a69c 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -16,6 +16,7 @@ , setuptools , aiofiles , altair +, diffusers , fastapi , ffmpy , gradio-client @@ -40,6 +41,10 @@ , typer , tomlkit +# oauth +, authlib +, itsdangerous + # check , pytestCheckHook , boto3 @@ -57,7 +62,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.20.1"; + version = "4.22.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -66,7 +71,7 @@ buildPythonPackage rec { # and upstream has stopped tagging releases since 3.41.0 src = fetchPypi { inherit pname version; - hash = "sha256-nvuIpOFib09FJGfkX0TDfb2LV/eDn3EybsFp5A3lzas="; + hash = "sha256-nhrT509xB3+R+HF6TF5AQGnfufT6iNmzjxZgcVL7fBo="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -98,6 +103,7 @@ buildPythonPackage rec { setuptools # needed for 'pkg_resources' aiofiles altair + diffusers fastapi ffmpy gradio-client @@ -123,6 +129,11 @@ buildPythonPackage rec { tomlkit ] ++ typer.passthru.optional-dependencies.all; + passthru.optional-dependencies.oauth = [ + authlib + itsdangerous + ]; + nativeCheckInputs = [ pytestCheckHook boto3 @@ -138,9 +149,11 @@ buildPythonPackage rec { transformers vega-datasets - # mock npm to make `shutil.which("npm")` pass + # mock calls to `shutil.which(...)` (writeShellScriptBin "npm" "false") - ] ++ pydantic.passthru.optional-dependencies.email; + ] + ++ passthru.optional-dependencies.oauth + ++ pydantic.passthru.optional-dependencies.email; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. @@ -173,6 +186,9 @@ buildPythonPackage rec { # fails without network "test_download_if_url_correct_parse" + + # tests if pip and other tools are installed + "test_get_executable_path" ]; disabledTestPaths = [ # 100% touches network @@ -196,19 +212,17 @@ buildPythonPackage rec { # Cyclic dependencies are fun! # This is gradio without gradio-client and gradio-pdf - passthru = { - sans-reverse-dependencies = (gradio.override (old: { + passthru.sans-reverse-dependencies = (gradio.override (old: { gradio-client = null; gradio-pdf = null; })).overridePythonAttrs (old: { - pname = old.pname + "-sans-client"; + pname = old.pname + "-sans-reverse-dependencies"; pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio-client" ]; doInstallCheck = false; doCheck = false; pythonImportsCheck = null; dontCheckRuntimeDeps = true; }); - }; meta = with lib; { homepage = "https://www.gradio.app/"; diff --git a/pkgs/development/python-modules/latexify-py/default.nix b/pkgs/development/python-modules/latexify-py/default.nix index ccda72eb03d7f..0c00ffdacadd0 100644 --- a/pkgs/development/python-modules/latexify-py/default.nix +++ b/pkgs/development/python-modules/latexify-py/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "latexify-py"; - version = "0.4.2"; + version = "0.4.3-post1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "google"; repo = "latexify_py"; rev = "refs/tags/v${version}"; - hash = "sha256-bBtAtBJfpStNYWhOJoypDI9hhE4g1ZFHBU8p6S1yCgU="; + hash = "sha256-4924pqgc+C8VDTTK5Dac6UJV0tcicVBdnkWvE1ynyvY="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ dill ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index df6e3b92e2892..45b92fdae27bd 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.20"; + version = "0.10.23"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-F7k5gtmhFdn369Ws5PSJ/xTid6ONstoWPotk+DmDtLw="; + hash = "sha256-koFdHpcMX4Qg+LLDcjHx4wYxHnrJaAqebpba0ejINzo="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index 41e3843220f5d..00572d723d8f6 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -1,28 +1,43 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-embeddings-openai"; - - inherit (llama-index-core) version src meta; - + version = "0.1.7"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_embeddings_openai"; + inherit version; + hash = "sha256-xxzJggaAxM7fyYRdyHuU9oUdHMzh5Ib8kSmPj6jZ8n0="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.embeddings.openai" ]; + + meta = with lib; { + description = "LlamaIndex Embeddings Integration for OpenAI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-s3"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index c778fb0e0512a..b0bc2e6f2d9e2 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -1,28 +1,43 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , poetry-core , llama-index-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - - inherit (llama-index-core) version src meta; - + version = "0.1.5"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/indices/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_indices_managed_llama_cloud"; + inherit version; + hash = "sha256-R83enwa73dUI8O/PQd5CXoUXGsLI/ail+yqJZz4cjHE="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.indices.managed.llama_cloud" ]; + + meta = with lib; { + description = "LlamaCloud Index and Retriever"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/indices/llama-index-indices-managed-llama-cloud"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix index e490c3db7e88d..120a210d8eeb0 100644 --- a/pkgs/development/python-modules/llama-index-legacy/default.nix +++ b/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -1,24 +1,39 @@ { lib , buildPythonPackage -, fetchFromGitHub -, poetry-core +, fetchPypi , llama-index-core +, poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-legacy"; - - inherit (llama-index-core) version src meta; - + version = "0.9.48"; pyproject = true; - sourceRoot = "${src.name}/${pname}"; + disabled = pythonOlder "3.8"; - nativeBuildInputs = [ + src = fetchPypi { + pname = "llama_index_legacy"; + inherit version; + hash = "sha256-gt3EaR7b9JUz1lWCwkm6IsA/6W+9PpL3dY3M7yjkODQ="; + }; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; + + # Tests are only available in the mono repo + doCheck = false; + + meta = with lib; { + description = "LlamaIndex Readers Integration for files"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-legacy"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index c0b10abd02510..8678e80272c1c 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -1,28 +1,43 @@ { lib , buildPythonPackage -, fetchFromGitHub -, poetry-core +, fetchPypi , llama-index-core +, poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-llms-openai"; - - inherit (llama-index-core) version src meta; - + version = "0.1.12"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/llms/${pname}"; + disabled = pythonOlder "3.8"; - nativeBuildInputs = [ + src = fetchPypi { + pname = "llama_index_llms_openai"; + inherit version; + hash = "sha256-QAygCDlRvWaM6Lwkh1znC2NufbMosnxqUObRorCBueY="; + }; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.llms.openai" ]; + + meta = with lib; { + description = "LlamaIndex LLMS Integration for OpenAI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/llms/llama-index-llms-openai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 825b001f5c613..3df214e8bffdd 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -1,30 +1,45 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , llama-index-llms-openai , poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - - inherit (llama-index-core) version src meta; - + version = "0.1.4"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/multi_modal_llms/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_multi_modal_llms_openai"; + inherit version; + hash = "sha256-al1lhMM6nRsGz1yHTGOvJgP8k7ZgveSBqMVH6HbG4sM="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core llama-index-llms-openai ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.multi_modal_llms.openai" ]; + + meta = with lib; { + description = "LlamaIndex Multi-Modal-Llms Integration for OpenAI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/multi_modal_llms/llama-index-multi-modal-llms-openai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix index d30bb7fb709ca..12b2f6a7ac9e0 100644 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -1,26 +1,31 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-agent-openai , llama-index-core , llama-index-llms-openai , poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-program-openai"; - - inherit (llama-index-core) version src meta; - + version = "0.1.4"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/program/${pname}"; + disabled = pythonOlder "3.8"; - nativeBuildInputs = [ + src = fetchPypi { + pname = "llama_index_program_openai"; + inherit version; + hash = "sha256-Vz6Zot0WrTyvOCyKso0awQ6yVxvJSB2EptiYBq1qpdQ="; + }; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-agent-openai llama-index-core llama-index-llms-openai @@ -29,4 +34,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "llama_index.program.openai" ]; + + meta = with lib; { + description = "LlamaIndex Program Integration for OpenAI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/program/llama-index-program-openai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix index dc7f0986542fb..aa302019772a5 100644 --- a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -25,15 +25,15 @@ buildPythonPackage rec { poetry-core ]; - # Tests are only available in the mono repo - doCheck = false; - dependencies = [ llama-index-core llama-index-llms-openai llama-index-program-openai ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.question_gen.openai" ]; diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix new file mode 100644 index 0000000000000..b2e6c41f7265f --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-readers-database"; + version = "0.1.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_database"; + inherit version; + hash = "sha256-9hbaUioGe8KVWX1O+Bwx0aOvJtVGb4lX/SZwYNJ/Xp0="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.readers.database" + ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for Databases"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-database"; + changelog = "https://github.com/run-llama/llama_index/blob/main/llama-index-integrations/readers/llama-index-readers-database/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix new file mode 100644 index 0000000000000..0cc7c10661e2e --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, llama-index-readers-file +, poetry-core +, pythonOlder +, s3fs +}: + +buildPythonPackage rec { + pname = "llama-index-readers-s3"; + version = "0.1.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_s3"; + inherit version; + hash = "sha256-FjRIo0sJGJikX4T4Esew3pBxEp7E3kK7Ds2uXDJqMzQ="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + llama-index-readers-file + s3fs + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.readers.s3" + ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for S3"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-s3"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix new file mode 100644 index 0000000000000..88ffcd410bf94 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +, tweepy +}: + +buildPythonPackage rec { + pname = "llama-index-readers-twitter"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_twitter"; + inherit version; + hash = "sha256-ZPwluiPdSkwMZ3JQy/HHhR7erYhUE9BWtplkfHk+TK8="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + tweepy + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.readers.twitter" + ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for Twitter"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-twitter"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix new file mode 100644 index 0000000000000..787026f8fc4b2 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-readers-txtai"; + version = "0.1.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_txtai"; + inherit version; + hash = "sha256-F1P3/ZICFDTqowpqu0AF2RIKfLTH9Phuw0O+VsHpI4U="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.readers.txtai" + ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for txtai"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-txtai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix index 773c737f342dd..1778322d63b49 100644 --- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -1,27 +1,31 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , poetry-core , pyowm +, pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "llama-index-readers-weather"; - version = "0.1.4"; - - inherit (llama-index-core) src meta; - + version = "0.1.3"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_weather"; + inherit version; + hash = "sha256-LJy2nU9f+yZZQm9stNn9mIqOkT5lOHaMIIm1Ezf2D0Q="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core pyowm ]; @@ -30,7 +34,17 @@ buildPythonPackage rec { pytestCheckHook ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.readers.weather" ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for Weather"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-weather"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 62e89093066d7..8c546307434a1 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -1,41 +1,42 @@ { lib , buildPythonPackage , chromadb -, fetchFromGitHub +, fetchPypi , llama-index-core -, onnxruntime +, pythonOlder , poetry-core -, pythonRelaxDepsHook -, tokenizers }: buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - - inherit (llama-index-core) version src meta; - + version = "0.1.6"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/vector_stores/${pname}"; + disabled = pythonOlder "3.8"; - pythonRelaxDeps = [ - "onnxruntime" - "tokenizers" - ]; + src = fetchPypi { + pname = "llama_index_vector_stores_chroma"; + inherit version; + hash = "sha256-bf89ydecQDn6Rs1Sjl5Lbe1kc+XvYyQkE0SRAH2k69s="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core - pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ chromadb llama-index-core - onnxruntime - tokenizers ]; pythonImportsCheck = [ "llama_index.vector_stores.chroma" ]; + + meta = with lib; { + description = "LlamaIndex Vector Store Integration for Chroma"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/vector_stores/llama-index-vector-stores-chroma"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index d4d289e078884..a7b132c230889 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.16.1"; - format = "pyproject"; + version = "2.16.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,15 +23,15 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-aOAFM8b0kOZT5/afZigZjJDvS2CyqghY6GATzeyySB4="; + hash = "sha256-g0O0ndHd2ehBUmHwb0HoWgCGSsqbjmlPFOd6KrkUv2Y="; }; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ pip ]; diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 40fb7397c70a3..cf424e9af8228 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.23.13"; + version = "1.23.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-jNTVdGrUQaYHgTxz6zYTdxNQoXEfy/zshherC/gGmng="; + hash = "sha256-ZOElXI2JSo+/wPw58WjCO7hiOUutfC2TvBFAP2DpT7I="; }; pythonRelaxDeps = [ @@ -39,12 +39,12 @@ buildPythonPackage rec { "tzdata" ]; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 dateparser playwright diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix index ac0b85d0ad546..6f7c79715618e 100644 --- a/pkgs/development/python-modules/prisma/default.nix +++ b/pkgs/development/python-modules/prisma/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "prisma"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "RobertCraigie"; repo = "prisma-client-py"; rev = "refs/tags/v${version}"; - hash = "sha256-j9HJZTt4VTq29Q+nynYmRWKx02GVdyA+iZzxZwspXn8="; + hash = "sha256-7pibexiFsyrwC6rVv0CGHRbQU4G3rOXVhQW/7c/vKJA="; }; build-system = [ diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix index 7cd0399dafcd4..2f7af9d474229 100644 --- a/pkgs/development/python-modules/riscv-config/default.nix +++ b/pkgs/development/python-modules/riscv-config/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "riscv-config"; - version = "3.17.0"; + version = "3.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "riscv-software-src"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dMs900w5sXggqxU+2W8qKrKjGpyrXhA2QEbXQeaKZTs="; + hash = "sha256-M36xS9rBnCPHWmHvAA6qC9J21K/zIjgsqEyhApJDKrE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 7e34e8b17a2dc..e12d4e6b8abb5 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1115"; + version = "3.0.1116"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-3tkkLB27R4trvS3LY0tRv0+q37SfT7S6gr9i1OWaNUU="; + hash = "sha256-TeS5ymvVbebzGdCbQL7HEtB4J4VgnzfEsB31zwjs6aE="; }; build-system = [ diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 8450fcde11262..f4529499c97d3 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -1,27 +1,35 @@ { lib -, fetchFromGitHub , buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core , deprecation , docker -, wrapt }: +, wrapt +}: buildPythonPackage rec { pname = "testcontainers"; - version = "4.0.0"; + version = "4.2.0"; + disabled = pythonOlder "3.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-cVVP9nGRTLC09KHalQDz7KOszjuFVVpMlee4btPNgd4="; + hash = "sha256-vHCrfeL3fPLZQgH7nlugIlADQaBbUQKsTBFhhq7kYWQ="; }; postPatch = '' echo "${version}" > VERSION ''; + nativeBuildInputs = [ + poetry-core + ]; + buildInputs = [ deprecation docker diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 79540ea997eec..8bdcf2e47ce98 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.2.0"; + version = "4.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uS6oVNS+JBN61SEVDwLQDoCf60SwqXV7831E2J+hb7I="; + hash = "sha256-lyscb7YYnT4A7juT1+9CBlb4DoeE1MT46ZPhRJgCa64="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix index ada7cc390b690..515f616dbe24a 100644 --- a/pkgs/development/python-modules/ttn-client/default.nix +++ b/pkgs/development/python-modules/ttn-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ttn-client"; - version = "0.0.3"; + version = "0.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angelnu"; repo = "thethingsnetwork_python_client"; rev = "refs/tags/v${version}"; - hash = "sha256-oHGv9huk400nPl4ytV8uxzK7eENpoBHt8uFjD2Ck67w="; + hash = "sha256-ZLSMxFyzfPtz51fsY2wgucHzcAnSrL7VPOuW7DXTNbQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a29cd3f894ed5..6a457c6051ed4 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.45"; + version = "3.2.47"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-mVGfWBQEWKS5WsWQUi8NdsR1bX21MbUnNDijZ/l/ksY="; + hash = "sha256-vwkTbHhgXaGeHrAkOM8gRDJ2VgbSmqt9Ia+qdOMxkko="; }; patches = [ diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix index 5fe0a88f25286..e88d5e0fc6821 100644 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , fetchurl -, fixup_yarn_lock +, prefetch-yarn-deps , git , lib , makeDesktopItem @@ -51,11 +51,11 @@ let pname = "${pname}-unwrapped"; inherit version src; - nativeBuildInputs = [ fixup_yarn_lock git nodejs util-linux yarn zip ]; + nativeBuildInputs = [ prefetch-yarn-deps git nodejs util-linux yarn zip ]; configurePhase = '' export HOME=$TMPDIR - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror ${offlineCache} yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules diff --git a/pkgs/development/tools/headache/default.nix b/pkgs/development/tools/headache/default.nix index 52e7da939b222..5781a8a54c18c 100644 --- a/pkgs/development/tools/headache/default.nix +++ b/pkgs/development/tools/headache/default.nix @@ -1,6 +1,8 @@ { lib, fetchFromGitHub, nix-update-script, ocamlPackages }: -with ocamlPackages; +let + inherit (ocamlPackages) buildDunePackage camomile; +in buildDunePackage rec { pname = "headache"; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index b5c506ad9b823..f96ad2248ee21 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -1,6 +1,10 @@ { lib, fetchFromGitHub, ocamlPackages }: -with ocamlPackages; buildDunePackage rec { +let + inherit (ocamlPackages) buildDunePackage lablgtk3-sourceview3 ocp-index; +in + +buildDunePackage rec { pname = "ocaml-top"; version = "1.2.0"; diff --git a/pkgs/development/tools/ocaml/opam-publish/default.nix b/pkgs/development/tools/ocaml/opam-publish/default.nix index b18b3e6707be9..9dc78266f9f39 100644 --- a/pkgs/development/tools/ocaml/opam-publish/default.nix +++ b/pkgs/development/tools/ocaml/opam-publish/default.nix @@ -1,6 +1,17 @@ { lib, fetchFromGitHub, ocamlPackages }: -with ocamlPackages; +let + inherit (ocamlPackages) + buildDunePackage + cmdliner + github + github-unix + lwt_ssl + opam-core + opam-format + opam-state + ; +in buildDunePackage rec { pname = "opam-publish"; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 67446277bf5da..07354161c1ab6 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.25.3"; + version = "2.25.4"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-jxt6YfYcpwOygzxMlqX+icwKFXrDljS1vmg+OpA3pWc="; + hash = "sha256-F3tvk3vC6h8fJ2hZMKo2eQ0uUj0UsK7MEujo//wXJi0="; }; vendorHash = "sha256-+Adnveutg8soqK2Zwn2SNq7SEHd/Z91diHbPYHrGVrA="; |