pyrox.dev
Merge pull request #132426 from 06kellyjac/buf
buf: 0.46.0 -> 0.49.0
+21
-10
pkgs/development/tools/buf/default.nix
+21
-10
pkgs/development/tools/buf/default.nix
···
7
7
8
8
buildGoModule rec {
9
9
pname = "buf";
10
-
version = "0.46.0";
10
+
version = "0.49.0";
11
11
12
12
src = fetchFromGitHub {
13
13
owner = "bufbuild";
14
14
repo = pname;
15
15
rev = "v${version}";
16
-
sha256 = "sha256-5mjk31HuPNO/RhmMhIm3dAZAED/Kk33ObjC8KbPKRxk=";
17
-
leaveDotGit = true; # Required by TestWorkspaceGit
16
+
sha256 = "sha256-xP2UbcHwimN09IXrGp3zhBLL74l/8YKotqBNRTITF18=";
18
17
};
19
-
vendorSha256 = "sha256-K8UZDEhAvD292RCEDKfY9PdZGS389vLF3oukcBndUF4=";
18
+
vendorSha256 = "sha256-WgQSLe99CbOwJC8ewDcSq6PcBJdmiPRmvAonq8drQ1w=";
20
19
21
20
patches = [
22
21
# Skip a test that requires networking to be available to work.
23
22
./skip_test_requiring_network.patch
23
+
# Skip TestWorkspaceGit which requires .git and commits.
24
+
./skip_test_requiring_dotgit.patch
24
25
];
25
26
26
27
nativeBuildInputs = [ protobuf ];
28
+
# Required for TestGitCloner
27
29
checkInputs = [ git ];
28
30
29
31
ldflags = [ "-s" "-w" ];
30
32
31
33
preCheck = ''
32
-
export PATH=$PATH:$GOPATH/bin
34
+
# The tests need access to some of the built utilities
35
+
export PATH="$PATH:$GOPATH/bin"
33
36
# To skip TestCloneBranchAndRefToBucket
34
37
export CI=true
35
38
'';
···
38
41
runHook preInstall
39
42
40
43
mkdir -p "$out/bin"
41
-
dir="$GOPATH/bin"
42
44
# Only install required binaries, don't install testing binaries
43
-
for file in \
45
+
for FILE in \
44
46
"buf" \
45
47
"protoc-gen-buf-breaking" \
46
48
"protoc-gen-buf-lint" \
47
49
"protoc-gen-buf-check-breaking" \
48
50
"protoc-gen-buf-check-lint"; do
49
-
cp "$dir/$file" "$out/bin/"
51
+
cp "$GOPATH/bin/$FILE" "$out/bin/"
50
52
done
51
53
52
54
runHook postInstall
53
55
'';
54
56
57
+
doInstallCheck = true;
58
+
installCheckPhase = ''
59
+
runHook preInstallCheck
60
+
$out/bin/buf --help
61
+
$out/bin/buf --version 2>&1 | grep "${version}"
62
+
runHook postInstallCheck
63
+
'';
64
+
55
65
meta = with lib; {
66
+
homepage = "https://buf.build";
67
+
changelog = "https://github.com/bufbuild/buf/releases/tag/v${version}";
56
68
description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices";
57
-
homepage = "https://buf.build";
58
69
license = licenses.asl20;
59
-
maintainers = with maintainers; [ raboof ];
70
+
maintainers = with maintainers; [ raboof jk ];
60
71
};
61
72
}
+14
pkgs/development/tools/buf/skip_test_requiring_dotgit.patch
+14
pkgs/development/tools/buf/skip_test_requiring_dotgit.patch
···
1
+
diff --git a/internal/buf/cmd/buf/workspace_test.go b/internal/buf/cmd/buf/workspace_test.go
2
+
index e051690..8887837 100644
3
+
--- a/internal/buf/cmd/buf/workspace_test.go
4
+
+++ b/internal/buf/cmd/buf/workspace_test.go
5
+
@@ -335,6 +335,9 @@ func TestWorkspaceNestedArchive(t *testing.T) {
6
+
}
7
+
8
+
func TestWorkspaceGit(t *testing.T) {
9
+
+ // Requires .git directory which we do not retain due to
10
+
+ // `leaveDotGit` non-determinism
11
+
+ t.Skip()
12
+
// Directory paths specified as a git reference within a workspace.
13
+
t.Parallel()
14
+
testRunStdout(