From ab393a21e4c09fed7f95e534b7fe945b0b55fc47 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 21 May 2025 16:53:44 -0700 Subject: [PATCH 1/2] python3Packages.google-cloud-iam: refactor Switched to new repo, building from github, set up passthru.updateScript, added maintainer. Not building due to old version not found in new repo. --- .../google-cloud-iam/default.nix | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index f928680d3faf..5e55cb5199b3 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + gitUpdater, google-api-core, google-auth, grpc-google-iam-v1, @@ -11,7 +12,6 @@ protobuf, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: @@ -20,14 +20,15 @@ buildPythonPackage rec { version = "2.18.3"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "google_cloud_iam"; - inherit version; - hash = "sha256-JlStzDhOHRigXFxO5V+MWxZcsjt0ECzNS8JV1ITFCnk="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "google-cloud-python"; + tag = "google-cloud-iam-v${version}"; + sha256 = "sha256-om/VLyv9jE64uEc0960MavzqAhBrLBvmLNeIFsniaAE="; }; + sourceRoot = "${src.name}/packages/google-cloud-iam"; + build-system = [ setuptools ]; dependencies = [ @@ -55,11 +56,18 @@ buildPythonPackage rec { "google.cloud.iam_credentials_v1" ]; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "google-cloud-iam-v"; + }; + + meta = { description = "IAM Service Account Credentials API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-iam"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-iam-v${version}/packages/google-cloud-iam/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ austinbutler ]; + changelog = "https://github.com/googleapis/google-cloud-python/blob/${src.tag}/packages/google-cloud-iam/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + austinbutler + sarahec + ]; }; } From 5b53db3dba24641cb8a5ab23ff2c5355967471e2 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 21 May 2025 17:04:34 -0700 Subject: [PATCH 2/2] python3Packages.google-cloud-iam: 2.18.3 -> 2.19.0 changelog: https://github.com/googleapis/google-cloud-python/releases/tag/google-cloud-iam-v2.19.0 diff: https://github.com/googleapis/google-cloud-python/compare/google-cloud-iam-v2.18.3...google-cloud-iam-v2.19.0 --- pkgs/development/python-modules/google-cloud-iam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 5e55cb5199b3..803aede8a80b 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.18.3"; + version = "2.19.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; tag = "google-cloud-iam-v${version}"; - sha256 = "sha256-om/VLyv9jE64uEc0960MavzqAhBrLBvmLNeIFsniaAE="; + hash = "sha256-E1LISOLQcXqUMTTPLR+lwkR6gF1fuGGB44j38cIK/Z4="; }; sourceRoot = "${src.name}/packages/google-cloud-iam";