Merge pull request #141751 from 06kellyjac/protoc-gen-grpc-web

pkgs/development/tools/protoc-gen-grpc-web/default.nix

@@ -1,28 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, protobuf }:
+{ lib, stdenv, fetchFromGitHub, protobuf }:
 
 stdenv.mkDerivation rec {
   pname = "protoc-gen-grpc-web";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc-web";
     rev = version;
-    sha256 = "sha256-NBENyc01O8NPo84z1CeZ7YvFvVGY2GSlcdxacRrQALw=";
+    sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw=";
   };
 
-  sourceRoot = "source/javascript/net/grpc/web";
-
-  # remove once PR merged
-  # https://github.com/grpc/grpc-web/pull/1107
-  patches = [
-    (fetchpatch {
-      name = "add-prefix.patch";
-      url = "https://github.com/06kellyjac/grpc-web/commit/b0803be1080fc635a8d5b88da971835a888a0c77.patch";
-      stripLen = 4;
-      sha256 = "sha256-Rw9Z7F8cYrc/UIGUN6yXOus4v+Qn9Yf1Nc301TFx85A=";
-    })
-  ];
+  sourceRoot = "source/javascript/net/grpc/web/generator";
 
   strictDeps = true;
   nativeBuildInputs = [ protobuf ];
@@ -30,11 +19,32 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  doCheck = true;
+  checkInputs = [ protobuf ];
+  checkPhase = ''
+    runHook preCheck
+
+    CHECK_TMPDIR="$TMPDIR/proto"
+    mkdir -p "$CHECK_TMPDIR"
+
+    protoc \
+      --proto_path="${src}/packages/grpc-web/test/protos" \
+      --plugin="./protoc-gen-grpc-web" \
+      --grpc-web_out="import_style=commonjs,mode=grpcwebtext:$CHECK_TMPDIR" \
+      echo.proto
+
+    # check for grpc-web generated file
+    [ -f "$CHECK_TMPDIR/echo_grpc_web_pb.js" ]
+
+    runHook postCheck
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/grpc/grpc-web";
     changelog = "https://github.com/grpc/grpc-web/blob/${version}/CHANGELOG.md";
     description = "gRPC web support for Google's protocol buffers";
     license = licenses.asl20;
     maintainers = with maintainers; [ jk ];
+    platforms = platforms.unix;
   };
 }