Update rules_haskell (digital-asset#10674)

* update rules_haskell changelog_begin changelog_end * Build proto3-suite lib and exe in same repo changelog_begin changelog_end * drop unneeded stack_snapshot packages * Use packages.bzl consistently * Sort stack_snapshot attribute values * Remove unused constant * drop unneeded stack_snapshot packages in compat changelog_begin changelog_end * Sort stack_snapshot attribute values in compat * Remove redundant dicts.add in compat Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
kgeonw · Aug 26, 2021 · 0b7980d · 0b7980d
1 parent 284edfc
commit 0b7980d
Show file tree

Hide file tree

Showing 13 changed files with 154 additions and 276 deletions.
diff --git a/3rdparty/haskell/BUILD.bazel b/3rdparty/haskell/BUILD.bazel
@@ -16,15 +16,15 @@ genrule(
     PROTO_FILE="$(location @com_github_bazelbuild_remote_apis//build/bazel/remote/execution/v2:remote_execution.proto)"
     PROTO_FILE_NAME="$$(echo "$$PROTO_FILE" | sed 's|^.*\\(build/bazel/.*\\)|\\1|g')"
     PROTO_DIR=$$(echo $${PROTO_FILE%$$PROTO_FILE_NAME})
-    $(location @proto3_suite//:compile-proto-file) \
+    $(location @proto3-suite//:compile-proto-file) \
       --proto "$$PROTO_FILE_NAME" \
       --includeDir "$$PROTO_DIR" \
       --includeDir "external/com_google_protobuf/src" \
       --includeDir "external/com_github_googleapis_googleapis" \
       --out $(RULEDIR)
   """,
     tools = [
-        "@proto3_suite//:compile-proto-file",
+        "@proto3-suite//:compile-proto-file",
     ],
     visibility = ["//visibility:public"],
 )

diff --git a/BAZEL-haskell.md b/BAZEL-haskell.md
@@ -122,7 +122,7 @@ stack_snapshot(
     ],
     vendored_packages = {
         "grpc-haskell-core": "@grpc_haskell_core//:grpc-haskell-core",
-        "proto3-suite": "@proto3_suite//:proto3-suite",
+        "proto3-suite": "@proto3-suite//:proto3-suite",
     },
     local_snapshot = "//:stack-snapshot.yaml",
     stack_snapshot_json = "//:stackage_snapshot.json",