From 3d7945013bf1f47cb69bc8cb9f1ff93548e7ae5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 18:40:35 +0200 Subject: [PATCH 1/2] python312Packages.ollama: 0.1.8 -> 0.1.9 Diff: https://github.com/ollama/ollama-python/compare/refs/tags/v0.1.8...v0.1.9 Changelog: https://github.com/ollama/ollama-python/releases/tag/v0.1.9 --- pkgs/development/python-modules/ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 8bc0639b016d..90671928c22a 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-hMNoWalUL+5FzmV5ICj7Zl6cTWzE6xGWfTf5++c36+E="; + hash = "sha256-ilJgRMzCn/T+6Lr7IuvaCnKhN5cyyEOWuV0N1FtR+Yg="; }; postPatch = '' From 4565925a480b6d59b5dcdbf07d14cb784f8f88ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 18:43:26 +0200 Subject: [PATCH 2/2] python312Packages.ollama: refactor - format with nixfmt --- .../python-modules/ollama/default.nix | 42 ++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 90671928c22a..4d1999a8aae8 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, httpx -, pillow -, poetry-core -, pytest-asyncio -, pytest-httpserver -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + httpx, + pillow, + poetry-core, + pytest-asyncio, + pytest-httpserver, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -30,18 +31,13 @@ buildPythonPackage rec { --replace-fail "0.0.0" "${version}" ''; - pythonRelaxDeps = [ - "httpx" - ]; + pythonRelaxDeps = [ "httpx" ]; - build-system = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; - dependencies = [ - httpx - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ httpx ]; nativeCheckInputs = [ pillow @@ -50,9 +46,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "ollama" - ]; + pythonImportsCheck = [ "ollama" ]; meta = with lib; { description = "Ollama Python library";