Merge pull request #59 from MercuryTechnologies/wavewave/update

compiler_flags -> ghcopts
tweag · Dec 22, 2023 · 6da34c1 · 6da34c1
2 parents 4507a89 + 7f7eea0
commit 6da34c1
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 26 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -89,7 +89,7 @@ load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 haskell_register_ghc_nixpkgs(
     attribute_path =
         "haskell.compiler.ghc" + ghc_version.replace(".", ""),
-    compiler_flags = [
+    ghcopts = [
         "-Werror",
         "-Wall",
         "-Wcompat",

diff --git a/example/WORKSPACE b/example/WORKSPACE
@@ -90,7 +90,7 @@ load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 haskell_register_ghc_nixpkgs(
     attribute_path =
         "haskell.compiler.ghc" + ghc_version.replace(".", ""),
-    compiler_flags = [
+    ghcopts = [
         "-Werror",
         "-Wall",
         "-Wcompat",

diff --git a/example/fix-cleanup-modules/BUILD.bazel b/example/fix-cleanup-modules/BUILD.bazel
@@ -20,7 +20,7 @@ load("@rules_haskell//haskell:defs.bzl", "haskell_library", "haskell_test")
 
 haskell_library(
     name = "fix-cleanup-modules",
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-XScopedTypeVariables",
         "-lm",
@@ -49,7 +49,7 @@ haskell_library(
 # gazelle_haskell_modules:keep
 haskell_library(
     name = "left-alone",
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-XScopedTypeVariables",
         "-lm",

diff --git a/example/package-a/BUILD.bazel b/example/package-a/BUILD.bazel
@@ -10,7 +10,7 @@ haskell_binary(
         "app/Main.hs",
         "app/PackageA/Other/C.hs",
     ],
-    compiler_flags = ["-DVERSION_package_a=\"0.1.0.0\""],
+    ghcopts = ["-DVERSION_package_a=\"0.1.0.0\""],
     version = "0.1.0.0",
     visibility = ["//visibility:public"],
     deps = [
@@ -26,7 +26,7 @@ haskell_binary(
         "app/AnotherMain.hs",
         "app/PackageA/Other/C.hs",
     ],
-    compiler_flags = ["-DVERSION_package_a=\"0.1.0.0\""],
+    ghcopts = ["-DVERSION_package_a=\"0.1.0.0\""],
     version = "0.1.0.0",
     visibility = ["//visibility:public"],
     deps = [
@@ -56,7 +56,7 @@ haskell_library(
     srcs = [
         "src-v2/PackageA/Exposed/A.hs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-Wall",
         "-Werror",
     ],
@@ -72,7 +72,7 @@ haskell_library(
         "src/PackageA/Other/B.hs",
         "src/PackageA/Other/D.lhs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_a=\"0.1.0.0\"",
         "-Wall",
         "-Werror",

diff --git a/example/package-b/BUILD.bazel b/example/package-b/BUILD.bazel
@@ -6,7 +6,7 @@ haskell_library(
         "src/PackageB/Exposed/A.hs",
         "src/PackageB/Other/B.hs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-XScopedTypeVariables",
         "-lm",
@@ -30,7 +30,7 @@ haskell_test(
         "tests/Main.hs",
         "tests/PackageB/Other/C.hs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-DTASTY_DISCOVER_TASTY_DISCOVER_PATH=$(location @stackage-exe//tasty-discover)",
     ],

diff --git a/example/package-c/BUILD.bazel b/example/package-c/BUILD.bazel
@@ -5,7 +5,7 @@ load("@rules_haskell//haskell:defs.bzl", "haskell_library", "haskell_test")
 # gazelle_haskell_modules:srcs: src/
 haskell_library(
     name = "package-c",
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-XScopedTypeVariables",
         "-lm",
@@ -30,7 +30,7 @@ haskell_library(
         "explicit-src/Explicit/DepOnAuto.hs",
         "explicit-src/Autodetect/Root.hs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-XScopedTypeVariables",
         "-lm",
@@ -48,7 +48,7 @@ haskell_library(
 # gazelle_haskell_modules:srcs: src/ multiple-folder-src/
 haskell_library(
     name = "package-c-multiple-srcs",
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-XScopedTypeVariables",
         "-lm",
@@ -72,7 +72,7 @@ haskell_library(
 # gazelle_haskell_modules:srcs: add-module-src/
 haskell_library(
     name = "package-c-detect-new",
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-XScopedTypeVariables",
         "-lm",
@@ -104,7 +104,7 @@ haskell_test(
         "tests/Main.hs",
         "tests/PackageC/Other/C.hs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-DTASTY_DISCOVER_TASTY_DISCOVER_PATH=$(location @stackage-exe//tasty-discover)",
     ],

diff --git a/example/package-d/BUILD.bazel b/example/package-d/BUILD.bazel
@@ -3,7 +3,7 @@ load("@rules_haskell//haskell:defs.bzl", "haskell_library", "haskell_test")
 
 haskell_library(
     name = "package-d",
-    compiler_flags = [
+    ghcopts = [
         "-XScopedTypeVariables",
         "-lm",
     ],
@@ -28,7 +28,7 @@ haskell_test(
         "tests/Main.hs",
         "tests/PackageD/C.hs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_d=\"0.1.0.0\"",
         "-DTASTY_DISCOVER_TASTY_DISCOVER_PATH=$(location @stackage-exe//tasty-discover)",
     ],

diff --git a/himportscan/BUILD.bazel b/himportscan/BUILD.bazel
@@ -27,7 +27,7 @@ haskell_toolchain_library(name = "text")
 haskell_library(
     name = "himportscan-library",
     srcs = glob(["src/**/*.hs"]),
-    compiler_flags = [
+    ghcopts = [
         "-Wall",
         "-Werror",
     ],
@@ -46,7 +46,7 @@ haskell_library(
 haskell_binary(
     name = "himportscan",
     srcs = ["exe/Main.hs"],
-    compiler_flags = [
+    ghcopts = [
         "-Wall",
         "-Werror",
     ],
@@ -64,7 +64,7 @@ haskell_binary(
 haskell_test(
     name = "tasty",
     srcs = glob(["tests/**/*.hs"]),
-    compiler_flags = [
+    ghcopts = [
         "-Wall",
         "-Werror",
         "-DTASTY_DISCOVER_TASTY_DISCOVER_PATH=$(location @stackage-exe//tasty-discover)",

diff --git a/tests/alternative-deps/WORKSPACE b/tests/alternative-deps/WORKSPACE
@@ -111,7 +111,7 @@ load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 haskell_register_ghc_nixpkgs(
     attribute_path =
         "haskell.compiler.ghc" + ghc_version.replace(".", ""),
-    compiler_flags = [
+    ghcopts = [
         "-Werror",
         "-Wall",
         "-Wcompat",

diff --git a/tests/alternative-deps/package-a/BUILD.bazel b/tests/alternative-deps/package-a/BUILD.bazel
@@ -10,7 +10,7 @@ haskell_binary(
         "app/Main.hs",
         "app/PackageA/Other/C.hs",
     ],
-    compiler_flags = ["-DVERSION_package_a=\"0.1.0.0\""],
+    ghcopts = ["-DVERSION_package_a=\"0.1.0.0\""],
     version = "0.1.0.0",
     visibility = ["//visibility:public"],
     deps = [
@@ -25,7 +25,7 @@ haskell_binary(
         "app/Main.hs",
         "app/PackageA/Other/C.hs",
     ],
-    compiler_flags = ["-DVERSION_package_a=\"0.1.0.0\""],
+    ghcopts = ["-DVERSION_package_a=\"0.1.0.0\""],
     version = "0.1.0.0",
     visibility = ["//visibility:public"],
     deps = [
@@ -41,7 +41,7 @@ haskell_library(
         "src/PackageA/Other/B.hs",
         "src/PackageA/Other/D.lhs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_a=\"0.1.0.0\"",
         "-Wall",
         "-Werror",

diff --git a/tests/alternative-deps/package-b/BUILD.bazel b/tests/alternative-deps/package-b/BUILD.bazel
@@ -6,7 +6,7 @@ haskell_library(
         "src/PackageB/Exposed/A.hs",
         "src/PackageB/Other/B.hs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-XScopedTypeVariables",
         "-lm",
@@ -29,7 +29,7 @@ haskell_test(
         "tests/Main.hs",
         "tests/PackageB/Other/C.hs",
     ],
-    compiler_flags = [
+    ghcopts = [
         "-DVERSION_package_b=\"0.1.0.0\"",
         "-DTASTY_DISCOVER_TASTY_DISCOVER_PATH=$(location @stackage-exe//tasty-discover)",
     ],