diff --git a/bazel-haskell-deps.bzl b/bazel-haskell-deps.bzl index 9a4e7349d93..61ea1c80154 100644 --- a/bazel-haskell-deps.bzl +++ b/bazel-haskell-deps.bzl @@ -17,8 +17,8 @@ load("@os_info//:os_info.bzl", "is_windows") load("@dadew//:dadew.bzl", "dadew_tool_home") load("@rules_haskell//haskell:cabal.bzl", "stack_snapshot") -GHCIDE_REV = "a6879b77da2968bae9256bb2f5658b909056d4ef" -GHCIDE_SHA256 = "94be2607354c7ab111b87fa2b4afe8f6ef50981277864a05e906b7b0a783c58f" +GHCIDE_REV = "c8818a7d7abf66a4a7302b360857e3a790ab1be4" +GHCIDE_SHA256 = "999cd7677b0e6747b6ab7a1e503afc23380cd0c12d9781b09f9a905b8f49cca7" GHCIDE_VERSION = "0.1.0" JS_JQUERY_VERSION = "3.3.1" JS_DGTABLE_VERSION = "0.5.2" diff --git a/daml-script/test/BUILD.bazel b/daml-script/test/BUILD.bazel index 3e78d7f4005..4c509c0219e 100644 --- a/daml-script/test/BUILD.bazel +++ b/daml-script/test/BUILD.bazel @@ -35,7 +35,7 @@ dependencies: - daml-prim - daml-script.dar EOF - $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location script-test.dar) + $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location script-test.dar) rm -rf $$TMP_DIR """.format(sdk = sdk_version), tools = ["//compiler/damlc"], @@ -66,7 +66,7 @@ dependencies: - daml-prim - daml-script-1.dev.dar EOF - $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location script-test-1.dev.dar) + $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location script-test-1.dev.dar) rm -rf $$TMP_DIR """.format(sdk = sdk_version), tools = ["//compiler/damlc"], @@ -99,7 +99,7 @@ dependencies: - daml-prim - daml-script.dar EOF - $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location script-test-no-ledger.dar) + $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location script-test-no-ledger.dar) rm -rf $$TMP_DIR """.format(sdk = sdk_version), tools = ["//compiler/damlc"], diff --git a/rules_daml/daml.bzl b/rules_daml/daml.bzl index 5d303a34c43..00959e1aef7 100644 --- a/rules_daml/daml.bzl +++ b/rules_daml/daml.bzl @@ -19,9 +19,7 @@ _zipper = attr.label( cfg = "host", ) -# For some reason, -Werror seems to turn on -Wmissing-signatures so we turn -# it off again. -ghc_opts = ["--ghc-option=-Werror", "--ghc-option=-Wno-error=missing-signatures"] +ghc_opts = ["--ghc-option=-Werror"] def _daml_configure_impl(ctx): project_name = ctx.attr.project_name diff --git a/triggers/service/BUILD.bazel b/triggers/service/BUILD.bazel index 8930d1f9fd8..1176ee84f65 100644 --- a/triggers/service/BUILD.bazel +++ b/triggers/service/BUILD.bazel @@ -211,7 +211,7 @@ dependencies: - daml-trigger.dar - daml-script.dar EOF - $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location test-model.dar) + $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location test-model.dar) rm -rf $$TMP_DIR """.format(sdk = sdk_version), tools = ["//compiler/damlc"], diff --git a/triggers/tests/BUILD.bazel b/triggers/tests/BUILD.bazel index 050e48fb1ea..8fe9350aab8 100644 --- a/triggers/tests/BUILD.bazel +++ b/triggers/tests/BUILD.bazel @@ -59,7 +59,7 @@ dependencies: - daml-script.dar EOF test -z "{lf_version}" || echo "build-options: [--target={lf_version}]" >> $$TMP_DIR/daml.yaml - $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location acs{suffix}.dar) + $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location acs{suffix}.dar) rm -rf $$TMP_DIR """.format( sdk = sdk_version,