Use the Go Jsonnet port instead of the C++ port

bazel-contrib · Jul 2, 2019 · d121631 · d121631
1 parent 67b2484
commit d121631
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/BUILD b/BUILD
diff --git a/README.md b/README.md
@@ -25,13 +25,22 @@ external repositories for Jsonnet:
 ```python
 http_archive(
     name = "io_bazel_rules_jsonnet",
+    # TODO: Update this to reflect a later release.
     sha256 = "59bf1edb53bc6b5adb804fbfabd796a019200d4ef4dd5cc7bdee03acc7686806",
     strip_prefix = "rules_jsonnet-0.1.0",
     urls = ["https://github.com/bazelbuild/rules_jsonnet/archive/0.1.0.tar.gz"],
 )
 load("@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_repositories")
 
 jsonnet_repositories()
+
+load("@jsonnet_go//bazel:repositories.bzl", "jsonnet_go_repositories")
+
+jsonnet_go_repositories()
+
+load("@jsonnet_go//bazel:deps.bzl", "jsonnet_go_dependencies")
+
+jsonnet_go_dependencies()
 ```
 
 <a name="#jsonnet_library"></a>

diff --git a/WORKSPACE b/WORKSPACE
@@ -17,6 +17,14 @@ load("//jsonnet:jsonnet.bzl", "jsonnet_repositories")
 
 jsonnet_repositories()
 
+load("@jsonnet_go//bazel:repositories.bzl", "jsonnet_go_repositories")
+
+jsonnet_go_repositories()
+
+load("@jsonnet_go//bazel:deps.bzl", "jsonnet_go_dependencies")
+
+jsonnet_go_dependencies()
+
 # Used for documenting Jsonnet rules.
 # TODO: Move this to docs/WORKSPACE when recursive repositories are enabled.
 git_repository(

diff --git a/examples/BUILD b/examples/BUILD
@@ -7,7 +7,6 @@ package(default_visibility = ["//visibility:public"])
 load(
     "@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl",
     "jsonnet_library",
-    "jsonnet_to_json",
     "jsonnet_to_json_test",
 )
 

diff --git a/examples/invalid.out b/examples/invalid.out
@@ -1,2 +1,3 @@
 RUNTIME ERROR: Foo.
-	../examples/invalid.jsonnet:15:1-13	
+	../examples/invalid.jsonnet:15:1-13	$
+	During evaluation	
diff --git a/jsonnet/jsonnet.bzl b/jsonnet/jsonnet.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 """Jsonnet Rules
 
@@ -403,7 +403,7 @@ _jsonnet_common_attrs = {
     ),
     "imports": attr.string_list(),
     "jsonnet": attr.label(
-        default = Label("@jsonnet//cmd:jsonnet"),
+        default = Label("@jsonnet_go//cmd/jsonnet"),
         cfg = "host",
         executable = True,
         allow_single_file = True,
@@ -788,11 +788,10 @@ Example:
 
 def jsonnet_repositories():
     """Adds the external dependencies needed for the Jsonnet rules."""
-    http_archive(
-        name = "jsonnet",
-        sha256 = "f6f0c4ea333f3423f1a7237a8a107c589354c38be8a2a438198f9f7c69b77596",
-        strip_prefix = "jsonnet-0.13.0",
-        urls = [
-            "https://github.com/google/jsonnet/archive/v0.13.0.tar.gz",
-        ],
+    git_repository(
+        name = "jsonnet_go",
+        # TODO: Update this once google/go-jsonnet#292 lands.
+        remote = "https://github.com/seh/go-jsonnet",
+        commit = "d66e58738f9ee529e34772ccd0e265a1c4b251f2",
+        init_submodules = True,
     )