From f85fcb37f3cc478b06127f789623ec28805033a7 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Thu, 20 Jun 2019 21:43:24 +0200
Subject: [PATCH] Switch --incompatible_disable_deprecated_attr_params

See: https://github.com/bazelbuild/bazel/issues/5818
---
 .bazelrc                                            | 2 --
 haskell/haskell.bzl                                 | 2 +-
 hazel/third_party/cabal2bazel/bzl/cabal_package.bzl | 2 +-
 hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl   | 5 ++---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 0f1f224430..9be75871ff 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -33,11 +33,9 @@ test:windows --experimental_enable_runfiles
 
 # WIP: bazel 0.27 fixs
 build\
-      --incompatible_disable_deprecated_attr_params=false\
       --incompatible_require_ctx_in_configure_features=false\
       --incompatible_depset_union=false
 test\
-      --incompatible_disable_deprecated_attr_params=false\
       --incompatible_require_ctx_in_configure_features=false\
       --incompatible_depset_union=false
 
diff --git a/haskell/haskell.bzl b/haskell/haskell.bzl
index 3ae79891a5..6b9c211e3f 100644
--- a/haskell/haskell.bzl
+++ b/haskell/haskell.bzl
@@ -293,7 +293,7 @@ haskell_import = rule(
         "hdrs": attr.label_list(allow_files = True),
         "includes": attr.string_list(),
         "haddock_interfaces": attr.label_list(allow_files = True),
-        "haddock_html": attr.label(allow_files = True, single_file = True),
+        "haddock_html": attr.label(allow_single_file = True),
         "_version_macros": attr.label(
             executable = True,
             cfg = "host",
diff --git a/hazel/third_party/cabal2bazel/bzl/cabal_package.bzl b/hazel/third_party/cabal2bazel/bzl/cabal_package.bzl
index 87472e34cb..7f73893524 100644
--- a/hazel/third_party/cabal2bazel/bzl/cabal_package.bzl
+++ b/hazel/third_party/cabal2bazel/bzl/cabal_package.bzl
@@ -125,7 +125,7 @@ def _hazel_symlink_impl(ctx):
 hazel_symlink = rule(
     implementation = _hazel_symlink_impl,
     attrs = {
-        "src": attr.label(mandatory = True, allow_files = True, single_file = True),
+        "src": attr.label(mandatory = True, allow_single_file = True),
         "out": attr.string(mandatory = True),
     },
     outputs = {"out": "%{out}"},
diff --git a/hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl b/hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl
index fc8312f57a..90fe60a2c7 100644
--- a/hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl
+++ b/hazel/third_party/cabal2bazel/bzl/cabal_paths.bzl
@@ -58,10 +58,9 @@ _path_module_gen = rule(
     attrs = {
         "data_dir": attr.string(),
         "module": attr.string(),
-        "version": attr.int_list(mandatory = True, non_empty = True),
+        "version": attr.int_list(mandatory = True, allow_empty = False),
         "_template": attr.label(
-            allow_files = True,
-            single_file = True,
+            allow_single_file = True,
             default = Label(
                 "@ai_formation_hazel//:paths-template.hs",
             ),