diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-09-14 23:11:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 23:11:37 +0800 |
| commit | 90956d40e6b8b4c98d6446daa69cddc73339c33b (patch) | |
| tree | 16adfca97edcad3dadaca0dc15fb20c590275d5c | |
| parent | Merge pull request #136937 from fabaff/aiogithubapi (diff) | |
| parent | buf: 0.52.0 -> 0.54.1 (diff) | |
| download | nixpkgs-90956d40e6b8b4c98d6446daa69cddc73339c33b.tar.gz | |
Merge pull request #136625 from yusdacra/update-buf
buf: 0.52.0 -> 0.54.1
| -rw-r--r-- | pkgs/development/tools/buf/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/buf/skip_test_requiring_dotgit.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/buf/skip_test_requiring_network.patch | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 8bc4aee935b9..d2b84ee3f6ee 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "buf"; - version = "0.52.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WFL+ztFR8kV6cRY1Ax2TheH+xpA58CLnW69jDpMhe3M="; + sha256 = "sha256-v8n1K2YrN8o4IPA2u6Sg5zsOM08nppg29vlU6ycMj9U="; }; - vendorSha256 = "sha256-vbphThpEYDDm1iipcY0QXhKKuLSD87sAxiIUi7SfrAc="; + vendorSha256 = "sha256-WLQ8Bw/UgRVTFEKpDbv6VZkMHQm2tgxekH3J7Sd5vC8="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch b/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch index c4a7803661ad..92626b72eff7 100644 --- a/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch +++ b/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch @@ -1,14 +1,14 @@ -diff --git a/internal/buf/cmd/buf/workspace_test.go b/internal/buf/cmd/buf/workspace_test.go -index e051690..8887837 100644 ---- a/internal/buf/cmd/buf/workspace_test.go -+++ b/internal/buf/cmd/buf/workspace_test.go -@@ -335,6 +335,9 @@ func TestWorkspaceNestedArchive(t *testing.T) { +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() - testRunStdout( diff --git a/pkgs/development/tools/buf/skip_test_requiring_network.patch b/pkgs/development/tools/buf/skip_test_requiring_network.patch index 8d3e15c17ffb..1b0cdfb12c03 100644 --- a/pkgs/development/tools/buf/skip_test_requiring_network.patch +++ b/pkgs/development/tools/buf/skip_test_requiring_network.patch @@ -1,8 +1,8 @@ -diff --git a/internal/buf/internal/buftesting/buftesting.go b/internal/buf/internal/buftesting/buftesting.go -index dc8da0c..70ad299 100644 ---- a/internal/buf/internal/buftesting/buftesting.go -+++ b/internal/buf/internal/buftesting/buftesting.go -@@ -100,6 +100,10 @@ func RunActualProtoc( +diff --git a/private/bufpkg/buftesting/buftesting.go b/private/bufpkg/buftesting/buftesting.go +index 82b3ec4..ef8263a 100644 +--- a/private/bufpkg/buftesting/buftesting.go ++++ b/private/bufpkg/buftesting/buftesting.go +@@ -99,6 +99,10 @@ func RunActualProtoc( // GetGoogleapisDirPath gets the path to a clone of googleapis. func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string { |