From 10b4ba9f7219667e349ffb2d720d177e612f1445 Mon Sep 17 00:00:00 2001
From: Philipp Stephani <phst@google.com>
Date: Sat, 5 Nov 2022 07:58:32 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"Reorder=20protocol=20buffer=20and=20?=
 =?UTF-8?q?=C2=B5pb=20dependencies."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a0fe31303ffb4118c63266cab04be45faa395f6c.

This doesn't fix anything.
---
 WORKSPACE              |  8 ++++----
 elisp/repositories.bzl | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 62b7556a..0b3e710e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -116,14 +116,14 @@ go_register_toolchains(
     version = "1.19.1",
 )
 
-load("@upb//bazel:workspace_deps.bzl", "upb_deps")
-
-upb_deps()
-
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
 
+load("@upb//bazel:workspace_deps.bzl", "upb_deps")
+
+upb_deps()
+
 http_archive(
     name = "com_grail_bazel_compdb",
     build_file = "@//:compdb.BUILD",
diff --git a/elisp/repositories.bzl b/elisp/repositories.bzl
index 7777610c..2c944cf3 100644
--- a/elisp/repositories.bzl
+++ b/elisp/repositories.bzl
@@ -86,20 +86,20 @@ def rules_elisp_dependencies():
     )
     maybe(
         http_archive,
-        name = "upb",
-        sha256 = "13f99a9b2591fdb6dc2997c619e0cf77655047b23fa8fd30c139ae4e8669e391",
-        strip_prefix = "upb-83f4988561baf5951bce6f07ddaa1cb325ba0241/",
+        name = "com_google_protobuf",
+        sha256 = "f10a175c9492847729a4eef787e85698b8f3ee83394a1a1d1d9f48f8835b74cf",
+        strip_prefix = "protobuf-21.6/",
         urls = [
-            "https://github.com/protocolbuffers/upb/archive/83f4988561baf5951bce6f07ddaa1cb325ba0241.zip",  # 2022-06-23
+            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.6.zip",  # 2022-09-13
         ],
     )
     maybe(
         http_archive,
-        name = "com_google_protobuf",
-        sha256 = "f10a175c9492847729a4eef787e85698b8f3ee83394a1a1d1d9f48f8835b74cf",
-        strip_prefix = "protobuf-21.6/",
+        name = "upb",
+        sha256 = "13f99a9b2591fdb6dc2997c619e0cf77655047b23fa8fd30c139ae4e8669e391",
+        strip_prefix = "upb-83f4988561baf5951bce6f07ddaa1cb325ba0241/",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.6.zip",  # 2022-09-13
+            "https://github.com/protocolbuffers/upb/archive/83f4988561baf5951bce6f07ddaa1cb325ba0241.zip",  # 2022-06-23
         ],
     )
     _toolchains(name = "phst_rules_elisp_toolchains")