diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/development/python-modules/ollama | |
parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/ollama')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/ollama/default.nix | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/ollama/default.nix b/nixpkgs/pkgs/development/python-modules/ollama/default.nix index 8bc0639b016d..4d1999a8aae8 100644 --- a/nixpkgs/pkgs/development/python-modules/ollama/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ollama/default.nix @@ -1,19 +1,20 @@ -{ 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 { pname = "ollama"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +23,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 = '' @@ -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"; |