Skip to content

Commit 9fe47b7

Browse files
protoc-gen-go-grpc: adopt (NixOS#365488)
2 parents 31413db + b79f3cd commit 9fe47b7

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

pkgs/by-name/op/opensnitch/package.nix

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,21 @@
1414
opensnitch,
1515
nixosTests,
1616
}:
17+
let
18+
# Override protoc-gen-go-grpc to use the compatible version
19+
protoc-gen-go-grpc' = protoc-gen-go-grpc.overrideAttrs (oldAttrs: rec {
20+
version = "1.3.0";
1721

22+
src = fetchFromGitHub {
23+
owner = "grpc";
24+
repo = "grpc-go";
25+
rev = "cmd/protoc-gen-go-grpc/v${version}";
26+
hash = "sha256-Zy0k5X/KFzCao9xAGt5DNb0MMGEyqmEsDj+uvXI4xH4=";
27+
};
28+
29+
vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI=";
30+
});
31+
in
1832
buildGoModule rec {
1933
pname = "opensnitch";
2034
version = "1.6.6";
@@ -43,7 +57,7 @@ buildGoModule rec {
4357
protobuf
4458
go-protobuf
4559
makeWrapper
46-
protoc-gen-go-grpc
60+
protoc-gen-go-grpc'
4761
];
4862

4963
vendorHash = "sha256-urRujxcp58ZuhUtTAqCK0etSZ16YYG/6JY/aOUodl9g=";

pkgs/by-name/pr/protoc-gen-go-grpc/package.nix

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,28 @@
66

77
buildGoModule rec {
88
pname = "protoc-gen-go-grpc";
9-
version = "1.3.0";
9+
version = "1.5.1";
1010
modRoot = "cmd/protoc-gen-go-grpc";
1111

1212
src = fetchFromGitHub {
1313
owner = "grpc";
1414
repo = "grpc-go";
1515
rev = "cmd/protoc-gen-go-grpc/v${version}";
16-
sha256 = "sha256-Zy0k5X/KFzCao9xAGt5DNb0MMGEyqmEsDj+uvXI4xH4=";
16+
hash = "sha256-PAUM0chkZCb4hGDQtCgHF3omPm0jP1sSDolx4EuOwXo=";
1717
};
1818

19-
vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI=";
19+
vendorHash = "sha256-yn6jo6Ku/bnbSX8FL0B/Uu3Knn59r1arjhsVUkZ0m9g=";
2020

21-
meta = with lib; {
21+
ldflags = [
22+
"-s"
23+
"-w"
24+
];
25+
26+
meta = {
2227
description = "Go language implementation of gRPC. HTTP/2 based RPC";
28+
homepage = "https://grpc.io/";
29+
license = lib.licenses.asl20;
30+
maintainers = with lib.maintainers; [ aaronjheng ];
2331
mainProgram = "protoc-gen-go-grpc";
24-
license = licenses.asl20;
25-
maintainers = [ ];
2632
};
2733
}

0 commit comments

Comments
 (0)