From 20d849a5e03945a5c764f3ffa98a6525378274e9 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Tue, 7 May 2019 11:30:28 -0700
Subject: Fixes for Bazel 0.25.

Disabled the conformance tests for now because I didn't push
the necessary changes to the protobuf repo yet.
---
 WORKSPACE | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'WORKSPACE')

diff --git a/WORKSPACE b/WORKSPACE
index d49b894..ff89757 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -17,11 +17,16 @@ http_archive(
 
 git_repository(
     name = "com_google_protobuf",
-    commit = "25feb59620627b673df76813dfd66e3f565765e7",
-    #sha256 = "d7a221b3d4fb4f05b7473795ccea9e05dab3b8721f6286a95fffbffc2d926f8b",
-    remote = "https://github.com/haberman/protobuf.git",
-    shallow_since = "1541281400 -0700"
-    #tag = "conformance-build-tag",
+    commit = "ec1a70913e5793a7d0a7b5fbf7e0e4f75409dd41",
+    remote = "https://github.com/protocolbuffers/protobuf.git",
+)
+
+http_archive(
+    name = "zlib",
+    build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
+    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
+    strip_prefix = "zlib-1.2.11",
+    urls = ["https://zlib.net/zlib-1.2.11.tar.gz"],
 )
 
 git_repository(
-- 
cgit v1.2.3