From 138dd61f82c41816bf2977a7d42a291e81f08413 Mon Sep 17 00:00:00 2001
From: Ginger <ginger@gingershaped.computer>
Date: Thu, 15 Oct 2026 22:51:02 -0400
Subject: [PATCH] chore: Switch to upstream ruma

---
 Cargo.lock | 22 +++++++++++-----------
 Cargo.toml |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6d72cea40..4d0d21836 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5019,7 +5019,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.17.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "assign",
  "js_int",
@@ -5038,7 +5038,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.17.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "http",
  "js_int",
@@ -5051,7 +5051,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.25.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "as_variant",
  "assign",
@@ -5073,7 +5073,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.20.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "as_variant",
  "base64 0.23.1",
@@ -5106,7 +5106,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.35.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "as_variant",
  "indexmap 2.14.2",
@@ -5127,7 +5127,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.16.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "bytes",
  "http",
@@ -5149,7 +5149,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.12.1"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "js_int",
  "thiserror 2.0.21",
@@ -5158,7 +5158,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.20.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "as_variant",
  "cfg-if",
@@ -5174,7 +5174,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.16.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -5186,7 +5186,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.22.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "base64 0.23.1",
  "ed25519-dalek 3.0.0",
@@ -5203,7 +5203,7 @@ dependencies = [
 [[package]]
 name = "ruma-state-res"
 version = "0.18.0"
-source = "git+https://github.com/gingershaped/ruwuma.git?rev=ef98d8d0b111f563fab960c3f696493979fba3a7#ef98d8d0b111f563fab960c3f696493979fba3a7"
+source = "git+https://github.com/ruma/ruma.git?rev=62659d64f712adf3cad126df6b8969f785414bd5#62659d64f712adf3cad126df6b8969f785414bd5"
 dependencies = [
  "js_int",
  "ruma-common",
diff --git a/Cargo.toml b/Cargo.toml
index c70d5de05..7bce7584b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -347,8 +347,8 @@ version = "1.1.1"
 
 # Used for matrix spec type definitions and helpers
 [workspace.dependencies.ruma]
-git = "https://github.com/gingershaped/ruwuma.git"
-rev = "ef98d8d0b111f563fab960c3f696493979fba3a7"
+git = "https://github.com/ruma/ruma.git"
+rev = "62659d64f712adf3cad126df6b8969f785414bd5"
 features = [
     "appservice-api-c",
     "client-api",