diff --git a/pkgs/by-name/gp/gpt-cli/package.nix b/pkgs/by-name/gp/gpt-cli/package.nix index a72d1a21172c..d0bcb4129d6f 100644 --- a/pkgs/by-name/gp/gpt-cli/package.nix +++ b/pkgs/by-name/gp/gpt-cli/package.nix @@ -4,16 +4,17 @@ fetchFromGitHub, versionCheckHook, }: + python3Packages.buildPythonApplication rec { pname = "gpt-cli"; - version = "0.4.1"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "kharvd"; repo = "gpt-cli"; tag = "v${version}"; - hash = "sha256-G8iepcjZFMTwsMhtGYmVOK9NkHXLqLet5SJWDAx1usg="; + hash = "sha256-BNSMxf3rhKieXYnFqVdpiHmNCDjotJUflwa6mAgsVCc="; }; build-system = with python3Packages; [ @@ -28,6 +29,7 @@ python3Packages.buildPythonApplication rec { attrs black cohere + google-genai google-generativeai openai prompt-toolkit @@ -46,7 +48,9 @@ python3Packages.buildPythonApplication rec { ++ [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/gpt"; + versionCheckProgramArg = "--version"; meta = { diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index bcc2fb709123..b860838120bd 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -20,16 +20,18 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.16.2"; + version = "5.17.0"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; tag = version; - hash = "sha256-/knKmNbvMC+efdY+0adM62W81e/pMhGCxLU0KwxUhOE="; + hash = "sha256-spnkDzkPAjf/4vG7bB4d9RBc3tES+Va4wzmFJFA2/NI="; }; + pythonRelaxDeps = [ "httpx-sse" ]; + build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/httpx-sse/default.nix b/pkgs/development/python-modules/httpx-sse/default.nix index 622e8ae033d4..af17e3a88124 100644 --- a/pkgs/development/python-modules/httpx-sse/default.nix +++ b/pkgs/development/python-modules/httpx-sse/default.nix @@ -2,44 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, - setuptools, - setuptools-scm, - wheel, httpx, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, + setuptools-scm, + setuptools, sse-starlette, }: buildPythonPackage rec { pname = "httpx-sse"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "florimondmanca"; repo = "httpx-sse"; tag = version; - hash = "sha256-nU8vkmV/WynzQrSrq9+FQXtfAJPVLpMsRSuntU0HWrE="; + hash = "sha256-bSozSZmbRU5sc3jvVUOAXQWVBA8GhzM2R26uPdabS+w="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/florimondmanca/httpx-sse/commit/643938c805e671fa20adcf314b447f862b77bcda.patch?full_index=1"; - hash = "sha256-V2PyTlleyoLa0DuvdlU8zGNsI9C8bTjMUcLjx81/e5k="; - }) - ]; - - # pytest-cov configuration is not necessary for packaging - postPatch = '' - rm setup.cfg - ''; - build-system = [ setuptools setuptools-scm - wheel ]; dependencies = [ httpx ]; @@ -48,6 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook sse-starlette ];