From b972d229976d9c2e077a194352d25d96f3752995 Mon Sep 17 00:00:00 2001
From: Fugi <me@fugi.dev>
Date: Fri, 17 Nov 2023 20:38:36 +0100
Subject: [PATCH] matrix: use upstream ldap plugin

it has been updated and supports reading bind_password from a file now
---
 modules/matrix.nix            |  4 +---
 pkgs/matrix-synapse-ldap3.nix | 21 ---------------------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 pkgs/matrix-synapse-ldap3.nix

diff --git a/modules/matrix.nix b/modules/matrix.nix
index 76a69a4..1c4b38c 100644
--- a/modules/matrix.nix
+++ b/modules/matrix.nix
@@ -19,9 +19,7 @@ let
     return 200 '${builtins.toJSON data}';
   '';
 
-  # build ldap3 plugin from git because it's very outdated in nixpkgs
-  matrix-synapse-ldap3 = pkgs.python3.pkgs.callPackage ../pkgs/matrix-synapse-ldap3.nix { };
-  # matrix-synapse-ldap3 = config.services.matrix-synapse.package.plugins.matrix-synapse-ldap3;
+  matrix-synapse-ldap3 = config.services.matrix-synapse.package.plugins.matrix-synapse-ldap3;
 in
 {
   sops.secrets.matrix_ldap_search = {
diff --git a/pkgs/matrix-synapse-ldap3.nix b/pkgs/matrix-synapse-ldap3.nix
deleted file mode 100644
index 0635ab0..0000000
--- a/pkgs/matrix-synapse-ldap3.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ isPy3k, buildPythonPackage, pkgs, service-identity, ldap3, twisted, ldaptor, mock }:
-
-buildPythonPackage rec {
-  pname = "matrix-synapse-ldap3";
-  version = "0.2.2";
-
-  format = "pyproject";
-
-  src = pkgs.fetchFromGitHub {
-    owner = "matrix-org";
-    repo = "matrix-synapse-ldap3";
-    rev = "2584736204165f16c176567183f9c350ee253f74";
-    sha256 = "gMsC5FpC2zt5hypPdGgPbWT/Rwz38EoQz3tj5dQ9BQ8=";
-  };
-
-  propagatedBuildInputs = [ service-identity ldap3 twisted ];
-
-  # ldaptor is not ready for py3 yet
-  doCheck = !isPy3k;
-  checkInputs = [ ldaptor mock ];
-}