Reorder protocol buffer and µpb dependencies.

µpb itself depends on protocol buffers, and the version it depends on seems to
be incompatible to the one we request, so make sure the µpb dependency takes
precedence.

WORKSPACE

@@ -112,14 +112,14 @@ go_register_toolchains(
     version = "1.18.4",
 )
 
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
-
-protobuf_deps()
-
 load("@upb//bazel:workspace_deps.bzl", "upb_deps")
 
 upb_deps()
 
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
 http_archive(
     name = "com_grail_bazel_compdb",
     build_file = "@//:compdb.BUILD",

elisp/repositories.bzl

@@ -67,14 +67,6 @@ def rules_elisp_dependencies():
             "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip",  # 2021-11-03
         ],
     )
-    http_archive(
-        name = "com_google_protobuf",
-        sha256 = "8b28fdd45bab62d15db232ec404248901842e5340299a57765e48abe8a80d930",
-        strip_prefix = "protobuf-3.20.1/",
-        urls = [
-            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.20.1.tar.gz",  # 2022-04-22
-        ],
-    )
     http_archive(
         name = "upb",
         sha256 = "13f99a9b2591fdb6dc2997c619e0cf77655047b23fa8fd30c139ae4e8669e391",
@@ -87,6 +79,14 @@ def rules_elisp_dependencies():
         # release.
         patches = ["@phst_rules_elisp//:upb.patch"],
     )
+    http_archive(
+        name = "com_google_protobuf",
+        sha256 = "8b28fdd45bab62d15db232ec404248901842e5340299a57765e48abe8a80d930",
+        strip_prefix = "protobuf-3.20.1/",
+        urls = [
+            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.20.1.tar.gz",  # 2022-04-22
+        ],
+    )
     _toolchains(name = "phst_rules_elisp_toolchains")
 
 # buildifier: disable=unnamed-macro