From 63b0d0a3b9293db3a01b3398df00f5c5c9896a71 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 20 May 2024 17:43:33 +0800
Subject: [PATCH] buf: 1.31.0 -> 1.32.2

---
 pkgs/development/tools/buf/default.nix        | 20 +++++++++-------
 .../tools/buf/skip_broken_tests.patch         | 23 ++++---------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix
index 603c0865419c..3edfe7aea574 100644
--- a/pkgs/development/tools/buf/default.nix
+++ b/pkgs/development/tools/buf/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
-, protobuf
+, protobuf_26
 , git
 , testers
 , buf
@@ -10,20 +10,19 @@
 
 buildGoModule rec {
   pname = "buf";
-  version = "1.31.0";
+  version = "1.32.2";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
-    repo = pname;
+    repo = "buf";
     rev = "v${version}";
-    hash = "sha256-CNt7ZfUMRQNNVusaBgEW64WH1TFYz8yEBfKksGVRVUM=";
+    hash = "sha256-lSK1ETeCnK/NeCHaZoHcgFO5OhbE6XcvbJg1+p9x4Hg=";
   };
 
-  vendorHash = "sha256-kagSvwxVE+URRY2C5tRtdRwtHBIdQh3BWUG1b3+L8Os=";
+  vendorHash = "sha256-LMjDR8tTZPLiIKxvdGjeaVMOh76eYhmAlI7lDJ7HG7I=";
 
   patches = [
-    # Skip a test that requires networking to be available to work,
-    # and a test which requires the source checkout to be part of a git repository
+    # Skip a test that requires networking to be available to work.
     ./skip_broken_tests.patch
   ];
 
@@ -33,7 +32,11 @@ buildGoModule rec {
 
   nativeCheckInputs = [
     git # Required for TestGitCloner
-    protobuf # Required for buftesting.GetProtocFilePaths
+    protobuf_26 # Required for buftesting.GetProtocFilePaths
+  ];
+
+  checkFlags = [
+    "-skip=TestWorkspaceGit"
   ];
 
   preCheck = ''
@@ -74,5 +77,6 @@ buildGoModule rec {
     description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices";
     license = licenses.asl20;
     maintainers = with maintainers; [ jk lrewega ];
+    mainProgram = "buf";
   };
 }
diff --git a/pkgs/development/tools/buf/skip_broken_tests.patch b/pkgs/development/tools/buf/skip_broken_tests.patch
index c25f8c8c9304..8bde6a9f70bf 100644
--- a/pkgs/development/tools/buf/skip_broken_tests.patch
+++ b/pkgs/development/tools/buf/skip_broken_tests.patch
@@ -1,21 +1,8 @@
-diff --git a/private/buf/cmd/buf/workspace_unix_test.go b/private/buf/cmd/buf/workspace_unix_test.go
-index 22c84385..22548555 100644
---- a/private/buf/cmd/buf/workspace_unix_test.go
-+++ b/private/buf/cmd/buf/workspace_unix_test.go
-@@ -93,6 +93,8 @@ func TestWorkspaceAbsoluteFail(t *testing.T) {
- // Workflow run: https://github.com/bufbuild/buf/actions/runs/6510804063/job/17685247791.
- // Potential fix: https://stackoverflow.com/questions/22575662/filename-too-long-in-git-for-windows.
- func TestWorkspaceGit(t *testing.T) {
-+	// Fails because the source checkout is not part of a git repository while building with nix
-+	t.Skip()
- 	// Directory paths specified as a git reference within a workspace.
- 	t.Parallel()
- 	testRunStdout(
-diff --git a/private/bufpkg/buftesting/buftesting.go b/private/bufpkg/buftesting/buftesting.go
-index d9e1fdc6..6e08c439 100644
---- a/private/bufpkg/buftesting/buftesting.go
-+++ b/private/bufpkg/buftesting/buftesting.go
-@@ -104,6 +104,10 @@ func RunActualProtoc(
+diff --git a/private/buf/buftesting/buftesting.go b/private/buf/buftesting/buftesting.go
+index 1c650077..5422f703 100644
+--- a/private/buf/buftesting/buftesting.go
++++ b/private/buf/buftesting/buftesting.go
+@@ -106,6 +106,10 @@ func RunActualProtoc(
  
  // GetGoogleapisDirPath gets the path to a clone of googleapis.
  func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string {