diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 797ca5a05823..c321aca86236 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -1,59 +1,58 @@ -{ lib -, python3Packages -, fetchFromGitHub +{ + lib, + python3Packages, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.2.7"; + version = "0.2.8"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; rev = "refs/tags/${version}"; - hash = "sha256-vKVGSIneKQkFO1uoNaW/Yr6QTDhgokmIpkYFYIbm+U4="; + hash = "sha256-6UFNsEc6bYBrBYfCbeiDfemueeRMEXHGCT8junZVFtk="; }; pythonRelaxDeps = [ "aiosqlite" - "pillow" "httpx" + "ollama" "packaging" + "pillow" "typer" ]; + build-system = with python3Packages; [ poetry-core ]; + + nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; + propagatedBuildInputs = with python3Packages; [ - ollama - textual - typer - python-dotenv - httpx + aiohttp aiosql aiosqlite - pyperclip + httpx + ollama packaging - rich-pixels pillow - aiohttp + pyperclip + python-dotenv + rich-pixels + textual + typer ]; - nativeBuildInputs = with python3Packages; [ - poetry-core - pythonRelaxDepsHook - ]; - - pythonImportsCheck = [ - "oterm" - ]; + pythonImportsCheck = [ "oterm" ]; # Tests require a HTTP connection to ollama doCheck = false; meta = { - changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; description = "A text-based terminal client for Ollama"; homepage = "https://github.com/ggozad/oterm"; + changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; license = lib.licenses.mit; mainProgram = "oterm"; maintainers = with lib.maintainers; [ suhr ]; diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 4d1999a8aae8..299af4e9c964 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.1.9"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ilJgRMzCn/T+6Lr7IuvaCnKhN5cyyEOWuV0N1FtR+Yg="; + hash = "sha256-kfotKUUXBekUd0X32BYAjNWvQJO94bdEDCSrBg2yJRQ="; }; postPatch = ''