diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index c9cfaeae73fd..5254ba230cda 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -19,21 +19,21 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.20.0"; + version = "2.24.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-api-core"; - rev = "v${version}"; - hash = "sha256-ccjkGQNaPRefI6+j/O+NwdBGEVNuZ5q5m1d8EAJGcbs="; + tag = "v${version}"; + hash = "sha256-6U5rNhF4AYWae50pNIqDdlMzRhW4iV9vPlMPXN11DqQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ googleapis-common-protos google-auth protobuf @@ -42,6 +42,7 @@ buildPythonPackage rec { ]; optional-dependencies = { + async_rest = [ google-auth ] ++ google-auth.optional-dependencies.aiohttp; grpc = [ grpcio grpcio-status diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index ae3cd88eeef7..1652041c7da7 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, - isPy3k, + fetchFromGitHub, + setuptools, protobuf, googleapis-common-protos, pytestCheckHook, @@ -11,16 +11,19 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.24.0"; - format = "setuptools"; - disabled = !isPy3k; + version = "1.25.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-MLcqXsr+RAaw0znbNbVsQFkGTmkie4w72nRiOX+WZEU="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "proto-plus-python"; + tag = "v${version}"; + hash = "sha256-rRA5t3QPVSeAqy60icrgvYKbvrClv22I3IYxHoMftQ0="; }; - propagatedBuildInputs = [ protobuf ]; + build-system = [ setuptools ]; + + dependencies = [ protobuf ]; nativeCheckInputs = [ pytestCheckHook