From 1e09b24704b8286c550daaf06e8cb5ae874a8cf2 Mon Sep 17 00:00:00 2001
From: Andre Brisco <andre.brisco@protonmail.com>
Date: Wed, 14 Aug 2024 11:47:20 -0700
Subject: [PATCH 1/2] Bump rules_proto

---
 WORKSPACE | 28 +++++++++++++++++++++++-----
 init.bzl  |  8 --------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index b987149b..fbfc5c6c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -131,16 +131,34 @@ load("@rules_7zip//:setup.bzl", "setup_7zip")
 
 setup_7zip()
 
+maybe(
+    http_archive,
+    name = "bazel_features",
+    sha256 = "ba1282c1aa1d1fffdcf994ab32131d7c7551a9bc960fbf05f42d55a1b930cbfb",
+    strip_prefix = "bazel_features-1.15.0",
+    url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.15.0/bazel_features-v1.15.0.tar.gz",
+)
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
 maybe(
     http_archive,
     name = "rules_proto",
-    sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
-    strip_prefix = "rules_proto-5.3.0-21.7",
-    urls = [
-        "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
-    ],
+    sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
+    strip_prefix = "rules_proto-6.0.2",
+    url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
 )
 
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
+
+rules_proto_dependencies()
+
+load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
+
+rules_proto_toolchains()
+
 maybe(
     http_archive,
     name = "rules_pkg",
diff --git a/init.bzl b/init.bzl
index 6a811821..08595320 100644
--- a/init.bzl
+++ b/init.bzl
@@ -19,11 +19,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 load("@rules_bison//bison:bison.bzl", "bison_register_toolchains")
 load("@rules_flex//flex:flex.bzl", "flex_register_toolchains")
 load("@rules_m4//m4:m4.bzl", "m4_register_toolchains")
-load(
-    "@rules_proto//proto:repositories.bzl",
-    "rules_proto_dependencies",
-    "rules_proto_toolchains",
-)
 load("//dependency_support:requirements.bzl", install_pip_deps = "install_deps")
 load("//dependency_support/boost:init_boost.bzl", "init_boost")
 
@@ -50,9 +45,6 @@ def init(python_interpreter = None, python_interpreter_target = None):
         Python toolchain. `python_interpreter_target` takes precedence over
         `python_interpreter` if both are set.
     """
-    rules_proto_dependencies()
-    rules_proto_toolchains()
-
     install_deps_kwargs = {}
     if python_interpreter:
         install_deps_kwargs["python_interpreter"] = python_interpreter

From 33816a0e7e69955347a39963af78e8ee54cd7136 Mon Sep 17 00:00:00 2001
From: Andre Brisco <andre.brisco@protonmail.com>
Date: Wed, 14 Aug 2024 13:24:40 -0700
Subject: [PATCH 2/2] Move macros back to init.bzl

---
 WORKSPACE | 8 --------
 init.bzl  | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index fbfc5c6c..54fea040 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -151,14 +151,6 @@ maybe(
     url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
 )
 
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
-
-rules_proto_dependencies()
-
-load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
-
-rules_proto_toolchains()
-
 maybe(
     http_archive,
     name = "rules_pkg",
diff --git a/init.bzl b/init.bzl
index 08595320..04b3f2f7 100644
--- a/init.bzl
+++ b/init.bzl
@@ -19,6 +19,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 load("@rules_bison//bison:bison.bzl", "bison_register_toolchains")
 load("@rules_flex//flex:flex.bzl", "flex_register_toolchains")
 load("@rules_m4//m4:m4.bzl", "m4_register_toolchains")
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
+load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
 load("//dependency_support:requirements.bzl", install_pip_deps = "install_deps")
 load("//dependency_support/boost:init_boost.bzl", "init_boost")
 
@@ -45,6 +47,10 @@ def init(python_interpreter = None, python_interpreter_target = None):
         Python toolchain. `python_interpreter_target` takes precedence over
         `python_interpreter` if both are set.
     """
+
+    rules_proto_dependencies()
+    rules_proto_toolchains()
+
     install_deps_kwargs = {}
     if python_interpreter:
         install_deps_kwargs["python_interpreter"] = python_interpreter