From d7f28652048b3bed6a512542e62ea1a50691e349 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Tue, 6 Jun 2023 02:54:21 +0000
Subject: [PATCH] buf: 1.20.0 -> 1.21.0

---
 pkgs/development/tools/buf/default.nix             | 10 +++-------
 .../tools/buf/skip_test_requiring_dotgit.patch     | 14 --------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/tools/buf/skip_test_requiring_dotgit.patch

diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix
index 6f981dc93a11..7342697ca32c 100644
--- a/pkgs/development/tools/buf/default.nix
+++ b/pkgs/development/tools/buf/default.nix
@@ -10,22 +10,20 @@
 
 buildGoModule rec {
   pname = "buf";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Tr8vsa7PfjoShep2/qhMFLWd4H9xXm9G2YwDS3RenSE=";
+    hash = "sha256-7aS48tfONrDdE+NoTpoz+5TOBDQfEgCwKKkoBnrUTW8=";
   };
 
-  vendorHash = "sha256-NnN0MvcyMdIc7vCTTz8yHdRu0SzmmO0DgyYR2k9NPdk=";
+  vendorHash = "sha256-zk7cj3DwfaZg7PRS50qw0tS8lguX4yWcCiPk+2HYah8=";
 
   patches = [
     # Skip a test that requires networking to be available to work.
     ./skip_test_requiring_network.patch
-    # Skip TestWorkspaceGit which requires .git and commits.
-    ./skip_test_requiring_dotgit.patch
   ];
 
   nativeBuildInputs = [ installShellFiles ];
@@ -40,8 +38,6 @@ buildGoModule rec {
   preCheck = ''
     # The tests need access to some of the built utilities
     export PATH="$PATH:$GOPATH/bin"
-    # To skip TestCloneBranchAndRefToBucket
-    export CI=true
   '';
 
   # Allow tests that bind or connect to localhost on macOS.
diff --git a/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch b/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch
deleted file mode 100644
index 92626b72eff7..000000000000
--- a/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/private/buf/cmd/buf/workspace_test.go b/private/buf/cmd/buf/workspace_test.go
-index 25e33dd..f593beb 100644
---- a/private/buf/cmd/buf/workspace_test.go
-+++ b/private/buf/cmd/buf/workspace_test.go
-@@ -340,6 +340,9 @@ func TestWorkspaceNestedArchive(t *testing.T) {
- }
- 
- func TestWorkspaceGit(t *testing.T) {
-+	// Requires .git directory which we do not retain due to
-+	// `leaveDotGit` non-determinism
-+	t.Skip()
- 	t.Skip("skip until the move to private/buf is merged")
- 	// Directory paths specified as a git reference within a workspace.
- 	t.Parallel()