From bf19852090b1f9d86a91ebe8f864a1a467f44ff5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Sep 2024 17:16:47 +0200
Subject: [PATCH] python312Packages.ms-active-directory: 1.13.0 -> 1.14.0

Diff: https://github.com/zorn96/ms_active_directory/compare/refs/tags/v1.13.0...v1.14.0

Changelog: https://github.com/zorn96/ms_active_directory/releases/tag/v1.14.0
---
 .../ms-active-directory/default.nix           | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/ms-active-directory/default.nix b/pkgs/development/python-modules/ms-active-directory/default.nix
index 9f0b1315a826..074b4bf380eb 100644
--- a/pkgs/development/python-modules/ms-active-directory/default.nix
+++ b/pkgs/development/python-modules/ms-active-directory/default.nix
@@ -3,29 +3,42 @@
   buildPythonPackage,
   dnspython,
   fetchFromGitHub,
+  fetchpatch,
   ldap3,
   pyasn1,
   pycryptodome,
   pythonOlder,
   pytz,
+  setuptools,
   six,
 }:
 
 buildPythonPackage rec {
   pname = "ms-active-directory";
-  version = "1.13.0";
-  format = "setuptools";
+  version = "1.14.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "zorn96";
     repo = "ms_active_directory";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+wfhtEGuC1R5jbEnWm4mDHIR096KKEcG/K8SuItwjGk=";
+    hash = "sha256-E0GzKkpQU9pJ1a1N0NZjB2Q99yMlJkzNR0QzyiUzOpg=";
   };
 
-  propagatedBuildInputs = [
+  patches = [
+    # Fix introduced syntax errors, https://github.com/zorn96/ms_active_directory/pull/88
+    (fetchpatch {
+      name = "fix-syntax.patch";
+      url = "https://github.com/zorn96/ms_active_directory/pull/88/commits/35da06a224b9bff6d36ddbd2dee8fdedab7e17bc.patch";
+      hash = "sha256-0WGyr3Q4vcfFU72fox3/3AdHCmjzf6jGCGPx5vhhUvM=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     dnspython
     ldap3
     pyasn1
@@ -43,7 +56,7 @@ buildPythonPackage rec {
     description = "Python module for integrating with Microsoft Active Directory domains";
     homepage = "https://github.com/zorn96/ms_active_directory/";
     changelog = "https://github.com/zorn96/ms_active_directory/releases/tag/v${version}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }