From 367f4a6a8d504c00f6a9623bac9f6b659f64102f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 10:18:57 +0200 Subject: [PATCH 1/2] python312Packages.google-generativeai: 0.4.1 -> 0.5.0 Diff: https://github.com/google/generative-ai-python/compare/refs/tags/v0.4.1...v0.5.0 Changelog: https://github.com/google/generative-ai-python/releases/tag/v0.5.0 --- .../google-generativeai/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index dfcc2e06034a..4aa90adbb1f9 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -3,11 +3,12 @@ , fetchFromGitHub , google-ai-generativelanguage , google-api-core +, google-api-python-client , google-auth , protobuf +, pydantic , pythonOlder , pythonRelaxDepsHook -, pydantic , setuptools , tqdm , typing-extensions @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.4.1"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+PRsxwy8Um6wCku9s7h8ERKEhcFsomEYAwYg+vpAGyg="; + hash = "sha256-WFkzqsiYADrxVUHClBHY0+oYz2sF52DrVblHT+94QYw="; }; pythonRelaxDeps = [ @@ -32,14 +33,18 @@ buildPythonPackage rec { ]; build-system = [ - pythonRelaxDepsHook setuptools ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + dependencies = [ google-ai-generativelanguage - google-auth google-api-core + google-api-python-client + google-auth protobuf pydantic tqdm From 090ee63bebad38a16aaf4932d62001a612b37146 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 10:19:57 +0200 Subject: [PATCH 2/2] python312Packages.google-generativeai: format with nixfmt --- .../google-generativeai/default.nix | 45 ++++++++----------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 4aa90adbb1f9..a63b61ca09c2 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, google-ai-generativelanguage -, google-api-core -, google-api-python-client -, google-auth -, protobuf -, pydantic -, pythonOlder -, pythonRelaxDepsHook -, setuptools -, tqdm -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + google-ai-generativelanguage, + google-api-core, + google-api-python-client, + google-auth, + protobuf, + pydantic, + pythonOlder, + pythonRelaxDepsHook, + setuptools, + tqdm, + typing-extensions, }: buildPythonPackage rec { @@ -28,17 +29,11 @@ buildPythonPackage rec { hash = "sha256-WFkzqsiYADrxVUHClBHY0+oYz2sF52DrVblHT+94QYw="; }; - pythonRelaxDeps = [ - "google-ai-generativelanguage" - ]; + pythonRelaxDeps = [ "google-ai-generativelanguage" ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ google-ai-generativelanguage @@ -54,9 +49,7 @@ buildPythonPackage rec { # Issue with the google.ai module. Check with the next release doCheck = false; - pythonImportsCheck = [ - "google.generativeai" - ]; + pythonImportsCheck = [ "google.generativeai" ]; meta = with lib; { description = "Python client library for Google's large language model PaLM API";