From bbdd82ee2a359614486b9917174de21534aa9525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 12 Mar 2026 13:44:52 +0100
Subject: [PATCH] matrix-synapse-plugins.matrix-synapse-ldap3: 0.3.0 -> 0.4.0

Diff: https://github.com/matrix-org/matrix-synapse-ldap3/compare/v0.3.0...v0.4.0
---
 .../plugins/ldap3.nix                         | 17 ++++++-------
 .../plugins/setuptools-pkg_resources.patch    | 24 -------------------
 2 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/setuptools-pkg_resources.patch

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix
index 15d61ad96b6b..5319942acfb9 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/ldap3.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   ldap3,
   ldaptor,
   matrix-synapse-unwrapped,
@@ -14,19 +14,16 @@
 
 buildPythonPackage rec {
   pname = "matrix-synapse-ldap3";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-i7ZRcXMWTUucxE9J3kEdjOvbLnBdXdHqHzhzPEoAnh0=";
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "matrix-synapse-ldap3";
+    tag = "v${version}";
+    hash = "sha256-d3TRtPEhyc45dj7k2TpJlBn8fZgKFDZxocKdfAoeI2w=";
   };
 
-  patches = [
-    # https://github.com/matrix-org/matrix-synapse-ldap3/pull/200
-    ./setuptools-pkg_resources.patch
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/setuptools-pkg_resources.patch b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/setuptools-pkg_resources.patch
deleted file mode 100644
index 32a79c6193ec..000000000000
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/setuptools-pkg_resources.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a879613c79861597525cdbab0d53dc4672c9a5a1 Mon Sep 17 00:00:00 2001
-From: Timotheus Pokorra <mailinglists@tpokorra.de>
-Date: Wed, 11 Feb 2026 06:54:10 +0100
-Subject: [PATCH] Replace pkg_resources.parse_version with
- packaging.version.parse
-
-fixes #199
----
- ldap_auth_provider.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ldap_auth_provider.py b/ldap_auth_provider.py
-index 25dd81b..1f1c9ef 100644
---- a/ldap_auth_provider.py
-+++ b/ldap_auth_provider.py
-@@ -21,7 +21,7 @@
- import ldap3
- import ldap3.core.exceptions
- import synapse
--from pkg_resources import parse_version
-+from packaging.version import parse as parse_version
- from synapse.module_api import ModuleApi
- from synapse.types import JsonDict
- from twisted.internet import threads