From e98ae5fed97f35e9124e94f2e9a008e5d995f6b0 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 26 Mar 2026 17:09:39 -0700 Subject: [PATCH 1/2] python3Packages.google-cloud-datacatalog: fix broken update --- .../google-cloud-datacatalog/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 6f3847f4fb69..61b82bd14d3d 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.31.3"; + version = "3.29.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-build-v${version}"; - hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; + tag = "google-cloud-datacatalog-v${version}"; + hash = "sha256-dVgcnnInqjUjySL7wjxGzI33t1YZJ8e9mSsmjAJ+fBI="; }; sourceRoot = "${src.name}/packages/google-cloud-datacatalog"; @@ -51,11 +51,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "google.cloud.datacatalog" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "google-cloud-datacatalog-v([0-9.]+)" - ]; + passthru = { + # bulk updater selects wrong tag + skipBulkUpdate = true; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "google-cloud-datacatalog-v([0-9.]+)" + ]; + }; }; meta = { From 29e0c12ee8a0ebf40ec46770d4d46b111d75ec39 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 26 Mar 2026 17:11:40 -0700 Subject: [PATCH 2/2] python3Packages.google-cloud-datacatalog: migrate to finalAttrs --- .../google-cloud-datacatalog/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 61b82bd14d3d..953254199a85 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,7 +14,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-datacatalog"; version = "3.29.0"; pyproject = true; @@ -22,11 +22,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-datacatalog-v${version}"; + tag = "google-cloud-datacatalog-v${finalAttrs.version}"; hash = "sha256-dVgcnnInqjUjySL7wjxGzI33t1YZJ8e9mSsmjAJ+fBI="; }; - sourceRoot = "${src.name}/packages/google-cloud-datacatalog"; + sourceRoot = "${finalAttrs.src.name}/packages/google-cloud-datacatalog"; build-system = [ setuptools ]; @@ -65,8 +65,8 @@ buildPythonPackage rec { meta = { description = "Google Cloud Data Catalog API API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-${src.tag}/packages/google-cloud-datacatalog/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-${finalAttrs.src.tag}/packages/google-cloud-datacatalog/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sarahec ]; }; -} +})