diff --git a/.bazelrc b/.bazelrc index 194ee8ebe4..0e94238eff 100644 --- a/.bazelrc +++ b/.bazelrc @@ -21,13 +21,11 @@ test:windows --experimental_enable_runfiles # WIP: bazel 0.27 fixs build\ --incompatible_disable_deprecated_attr_params=false\ - --incompatible_new_actions_api=false\ --incompatible_no_support_tools_in_action_inputs=false\ --incompatible_require_ctx_in_configure_features=false\ --incompatible_depset_union=false test\ --incompatible_disable_deprecated_attr_params=false\ - --incompatible_new_actions_api=false\ --incompatible_no_support_tools_in_action_inputs=false\ --incompatible_require_ctx_in_configure_features=false\ --incompatible_depset_union=false diff --git a/WORKSPACE b/WORKSPACE index 71852a4719..19d928150d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -98,11 +98,15 @@ nixpkgs_package( http_archive( name = "com_google_protobuf", - sha256 = "73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a", - strip_prefix = "protobuf-3.6.1.3", - urls = ["https://github.com/google/protobuf/archive/v3.6.1.3.tar.gz"], + sha256 = "03d2e5ef101aee4c2f6ddcf145d2a04926b9c19e7086944df3842b1b8502b783", + strip_prefix = "protobuf-3.8.0", + urls = ["https://github.com/google/protobuf/archive/v3.8.0.tar.gz"], ) +load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") + +protobuf_deps() # configure and install zlib for protobuf + nixpkgs_local_repository( name = "nixpkgs", nix_file = "//nixpkgs:default.nix", diff --git a/hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl b/hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl index b49e0fea33..fc8312f57a 100644 --- a/hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl +++ b/hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl @@ -28,14 +28,14 @@ load("@io_tweag_rules_haskell//haskell:haskell.bzl", "haskell_library") load("//tools:mangling.bzl", "hazel_library") def _impl_path_module_gen(ctx): - paths_file = ctx.new_file(ctx.label.name) + paths_file = ctx.actions.declare_file(ctx.label.name) base_dir = paths.join( ctx.label.package, ctx.attr.data_dir if ctx.attr.data_dir else "", ) - ctx.template_action( + ctx.actions.expand_template( template = ctx.file._template, output = paths_file, substitutions = {