🎨 Rework circl dependency (#156)

This lets external projects depend on the go targets in rules_ll. Previously this wasn't possible because modules overrides are disallowed in non-root modules.
eomii · Jun 2, 2023 · 531b2c6 · 531b2c6
1 parent 5c8aa7a
commit 531b2c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 66 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -69,16 +69,15 @@ use_repo(
 )
 
 bazel_dep(name = "rules_go", version = "0.39.1")
-bazel_dep(name = "gazelle", version = "23226de")
+
+# This overrides the Go dependency github.com/cloudflare/circl, which requires
+# custom patches beyond what Gazelle can generate.
+bazel_dep(name = "circl", version = "1.3.3")
+
+bazel_dep(name = "gazelle", version = "7feffe1")
+
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
-go_deps.module_override(
-    path = "github.com/cloudflare/circl",
-    patches = [
-        "@rules_ll//patches:go_circl_header_fix.diff",
-    ],
-    patch_strip = 1,
-)
 use_repo(
     go_deps,
     "com_github_pulumi_pulumi_kubernetes_sdk_v3",

diff --git a/patches/go_circl_header_fix.diff b/patches/go_circl_header_fix.diff