From 72360a55287f85ef15b039e4991e3b0459f47dd3 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Sun, 10 Mar 2024 18:08:08 +0900
Subject: Revert "feat(modules/matrix-homeserver): use synapse v1.102.0 PR"

This reverts commit 7321f5c20fc758da5e6ce3e5ada280dd9865afe7.

The commit was merged upstream.
---
 flake.lock | 17 -----------------
 flake.nix  |  9 +--------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9a463a0..495445b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -483,22 +483,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-synapse": {
-      "locked": {
-        "lastModified": 1709696403,
-        "narHash": "sha256-H8n1eSU8Y0V8WUMXuFh6Y/us0iYJt6uY0vA9xj+U+/0=",
-        "owner": "NickCao",
-        "repo": "nixpkgs",
-        "rev": "f226fb4d801f4973eeef9720cbc83097e1078a86",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NickCao",
-        "ref": "matrix-synapse",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1673606088,
@@ -552,7 +536,6 @@
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs-2111": "nixpkgs-2111",
         "nixpkgs-exotic": "nixpkgs-exotic",
-        "nixpkgs-synapse": "nixpkgs-synapse",
         "sefidel-web": "sefidel-web",
         "sops-nix": "sops-nix",
         "unstable": "unstable",
diff --git a/flake.nix b/flake.nix
index e106218..e9f1a01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,6 @@
     nixpkgs-2111.url = "github:nixos/nixpkgs/nixos-21.11";
 
     nixpkgs-exotic.url = "git+https://git.exotic.sh/nixpkgs-exotic";
-    nixpkgs-synapse.url = "github:NickCao/nixpkgs/matrix-synapse";
 
     colmena.url = "github:zhaofengli/colmena";
     colmena.inputs.nixpkgs.follows = "unstable";
@@ -35,13 +34,7 @@
 
       system = "x86_64-linux";
 
-      pkgs = import unstable { inherit system; overlays = [
-        inputs.nixpkgs-exotic.overlays.default
-        (final: prev: {
-          # TODO: https://github.com/NixOS/nixpkgs/pull/293650
-          inherit (inputs.nixpkgs-synapse.legacyPackages.${system}) matrix-synapse;
-        })
-      ]; };
+      pkgs = import unstable { inherit system; overlays = [ inputs.nixpkgs-exotic.overlays.default ]; };
 
       lib = unstable.lib.extend
         (self: super: { my = import ./lib { inherit pkgs inputs; lib = self; }; });
-- 
cgit 1.4.1