From fd4c7c10a8eb32a5b8ed7f7cbdc991692a36c30a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 13 Apr 2024 12:07:35 +0300 Subject: chore(3p/overlays/patches): vendor cbtemulator UDS patch I updated https://github.com/googleapis/google-cloud-go/pull/9665 in the meantime, and GH decided to GC the patches. Vendor the patch in for now (manually stripping the `bigtable/` prefix in the path). Hopefully the PR itself gets merged soon. Change-Id: I5b7ba78ccaf5c792c1445818b23b52d6f17155a2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11402 Reviewed-by: raitobezarius Tested-by: BuildkiteCI Autosubmit: flokli --- third_party/overlays/tvl.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'third_party/overlays/tvl.nix') diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index fd68aea55d..427e24971f 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -100,16 +100,7 @@ depot.nix.readTree.drvTargets { subPackages = [ "cmd/emulator" ]; patches = [ - (super.fetchpatch { - url = "https://github.com/googleapis/google-cloud-go/pull/9665/commits/7b716627fae4d8b28f175eff968090d27d4477eb.patch"; - hash = "sha256-nEVB7DjafByGHspfDYPcCRHMVHBjeSQ5MBVd6eeo4ls="; - stripLen = 1; - }) - (super.fetchpatch { - url = "https://github.com/googleapis/google-cloud-go/pull/9665/commits/a65bc68f49bd340040f836e890f1fd4d781f6f2a.patch"; - hash = "sha256-Zu1JXym+IK9pWp7HKJiGUv2HG776hUat8Qlty9/PsQs="; - stripLen = 1; - }) + ./patches/cbtemulator-uds.patch ]; postInstall = '' -- cgit 1.4.1