From a5c7788bc39d51a6360b59bc133248c318a3feb5 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 22 Dec 2024 12:53:06 +0000 Subject: [PATCH 1/2] protoc-gen-go-grpc: adopt --- pkgs/by-name/pr/protoc-gen-go-grpc/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix b/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix index 271a77e832f5..3bbd1c06a081 100644 --- a/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix @@ -18,10 +18,11 @@ buildGoModule rec { vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI="; - meta = with lib; { + meta = { description = "Go language implementation of gRPC. HTTP/2 based RPC"; + homepage = "https://grpc.io/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "protoc-gen-go-grpc"; - license = licenses.asl20; - maintainers = [ ]; }; } From b79f3cd3580c432e8eb603f3466d316196be8bcd Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 16 Dec 2024 12:01:38 +0800 Subject: [PATCH 2/2] protoc-gen-go-grpc: 1.3.0 -> 1.5.1 --- pkgs/by-name/op/opensnitch/package.nix | 16 +++++++++++++++- pkgs/by-name/pr/protoc-gen-go-grpc/package.nix | 11 ++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index 37433fb4a9ca..7049120e3985 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -14,7 +14,21 @@ opensnitch, nixosTests, }: +let + # Override protoc-gen-go-grpc to use the compatible version + protoc-gen-go-grpc' = protoc-gen-go-grpc.overrideAttrs (oldAttrs: rec { + version = "1.3.0"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc-go"; + rev = "cmd/protoc-gen-go-grpc/v${version}"; + hash = "sha256-Zy0k5X/KFzCao9xAGt5DNb0MMGEyqmEsDj+uvXI4xH4="; + }; + + vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI="; + }); +in buildGoModule rec { pname = "opensnitch"; version = "1.6.6"; @@ -43,7 +57,7 @@ buildGoModule rec { protobuf go-protobuf makeWrapper - protoc-gen-go-grpc + protoc-gen-go-grpc' ]; vendorHash = "sha256-urRujxcp58ZuhUtTAqCK0etSZ16YYG/6JY/aOUodl9g="; diff --git a/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix b/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix index 3bbd1c06a081..ffab717e5540 100644 --- a/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix @@ -6,17 +6,22 @@ buildGoModule rec { pname = "protoc-gen-go-grpc"; - version = "1.3.0"; + version = "1.5.1"; modRoot = "cmd/protoc-gen-go-grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-go"; rev = "cmd/protoc-gen-go-grpc/v${version}"; - sha256 = "sha256-Zy0k5X/KFzCao9xAGt5DNb0MMGEyqmEsDj+uvXI4xH4="; + hash = "sha256-PAUM0chkZCb4hGDQtCgHF3omPm0jP1sSDolx4EuOwXo="; }; - vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI="; + vendorHash = "sha256-yn6jo6Ku/bnbSX8FL0B/Uu3Knn59r1arjhsVUkZ0m9g="; + + ldflags = [ + "-s" + "-w" + ]; meta = { description = "Go language implementation of gRPC. HTTP/2 based RPC";