From f6bb8dbe1c3bb238ce9b77f2e69884755bba4dbd Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 13 Apr 2024 13:42:50 +0300
Subject: chore(3p/nixpkgs): drop most of cbtemulator expression

We bumped nixpkgs past that bump, so we only need to carry our
downstream UDS support patch.

Change-Id: I56504d71a8327cba2e43aa36b7b657f93cf35e51
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11405
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
---
 third_party/overlays/tvl.nix | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 427e24971f..33031f94c2 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -83,39 +83,12 @@ depot.nix.readTree.drvTargets {
     };
   }));
 
-  # Upstreamed in https://github.com/NixOS/nixpkgs/pull/298044,
-  # can be reduced to just the patch on the next nixpkgs bump.
-  cbtemulator = super.buildGoModule rec {
-    pname = "cbtemulator";
-    version = "1.22.0";
-
-    src = (super.fetchFromGitHub {
-      owner = "googleapis";
-      repo = "google-cloud-go";
-      rev = "bigtable/v${version}";
-      hash = "sha256-eOi4QFthnmZb5ry/5L7wzr4Fy1pF/H07BzxOnXtmSu4=";
-    }) + "/bigtable";
-
-    vendorHash = "sha256-7M7YZfl0usjN9hLGozqJV2bGh+M1ec4PZRGYUhEckpY=";
-    subPackages = [ "cmd/emulator" ];
-
-    patches = [
+  # https://github.com/googleapis/google-cloud-go/pull/9665
+  cbtemulator = super.cbtemulator.overrideAttrs (old: {
+    patches = old.patches or [ ] ++ [
       ./patches/cbtemulator-uds.patch
     ];
-
-    postInstall = ''
-      mv $out/bin/emulator $out/bin/cbtemulator
-    '';
-
-    meta = with lib; {
-      description = "In-memory Google Cloud Bigtable server";
-      homepage = "https://github.com/googleapis/google-cloud-go/blob/bigtable/v1.22.0/bigtable/cmd/emulator/cbtemulator.go";
-      license = licenses.asl20;
-      maintainers = [ maintainers.flokli ];
-      mainProgram = "cbtemulator";
-      platforms = platforms.all;
-    };
-  };
+  });
 
   crate2nix = super.rustPlatform.buildRustPackage rec {
     pname = "crate2nix";
-- 
cgit 1.4.1