about summary refs log tree commit diff
path: root/buildGo.nix
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-11-26T12·15+0000
committerVincent Ambo <tazjin@google.com>2019-11-26T12·28+0000
commitd3e8774a8e159984bfa2864d383a1d9b641a4c6f (patch)
treed3c26c233b1dbe493a8ce147b4d2eb359e041d6a /buildGo.nix
parent8b6b08b814af72e8b2f6281037f089e099a41e25 (diff)
feat(proto): Add protobuf & gRPC dependencies via external
Moves the Protobuf & gRPC dependencies to a separate file which uses
buildGo.external to build the dependencies.

The versions are pinned at master of 2019-11-26.
Diffstat (limited to 'buildGo.nix')
-rw-r--r--buildGo.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/buildGo.nix b/buildGo.nix
index 12504ce57103..bf8625c1b440 100644
--- a/buildGo.nix
+++ b/buildGo.nix
@@ -123,18 +123,8 @@ let
       paths = [ gopathSrc gopathPkg ];
     }) // { goDeps = uniqueDeps; };
 
-  # Protobuf & gRPC integration requires these dependencies:
-  proto-go-src = fetchFromGitHub {
-    owner = "golang";
-    repo = "protobuf";
-    rev = "ed6926b37a637426117ccab59282c3839528a700";
-    sha256 = "0fynqrim022x9xi2bivkw19npbz4316v4yr7mb677s9s36z4dc4h";
-  };
-
-  goProto = external {
-    path = "github.com/golang/protobuf";
-    src = proto-go-src;
-    deps = [];
+  protoLibs = import ./proto.nix {
+    inherit external;
   };
 in {
   # Only the high-level builder functions are exposed