Skip to content

Commit

Permalink
Switch --incompatible_new_actions_api
Browse files Browse the repository at this point in the history
See: bazelbuild/bazel#5825

Needs a protobuf update.

Note: the new protobuf needs zlib dependencies which are provided by
using protobuf_deps.
  • Loading branch information
guibou committed Jun 26, 2019
1 parent 3e5abd1 commit cea60ce
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .bazelrc
Expand Up @@ -34,13 +34,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
Expand Down
10 changes: 7 additions & 3 deletions WORKSPACE
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl
Expand Up @@ -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 = {
Expand Down

0 comments on commit cea60ce

Please sign in to comment.