diff --git a/pkgs/development/python-modules/msldap-bad/default.nix b/pkgs/development/python-modules/badldap/default.nix similarity index 76% rename from pkgs/development/python-modules/msldap-bad/default.nix rename to pkgs/development/python-modules/badldap/default.nix index 8f790f4c46db..9e57addb9161 100644 --- a/pkgs/development/python-modules/msldap-bad/default.nix +++ b/pkgs/development/python-modules/badldap/default.nix @@ -1,8 +1,8 @@ { lib, asn1crypto, - badauth, asysocks, + badauth, buildPythonPackage, fetchFromGitHub, kerbad, @@ -16,13 +16,13 @@ }: buildPythonPackage rec { - pname = "msldap-bad"; + pname = "badldap"; version = "0.5.10"; pyproject = true; src = fetchFromGitHub { owner = "CravateRouge"; - repo = "msldap-bAD"; + repo = "badldap"; tag = version; hash = "sha256-CnHXEE1tdIXv+Qb3pS+cNxVtcTOVaq6mrQxu3wr1Xxo="; }; @@ -30,9 +30,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - badauth asn1crypto asysocks + badauth kerbad prompt-toolkit tabulate @@ -45,12 +45,11 @@ buildPythonPackage rec { # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ "msldap" ]; + pythonImportsCheck = [ "badldap" ]; meta = { description = "LDAP library for auditing MS AD"; - homepage = "https://github.com/CravateRouge/msldap-bAD"; - changelog = "https://github.com/CravateRouge/msldap-bAD/releases/tag/${src.tag}"; + homepage = "https://github.com/CravateRouge/badldap"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index a993caa8e472..ff63a21d90ca 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -8,7 +8,7 @@ fetchFromGitHub, hatchling, kerbad, - msldap-bad, + badldap, pyasn1, pytestCheckHook, pythonOlder, @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonRemoveDeps = [ "kerbad" - "msldap-bad" + "badldap" ]; build-system = [ hatchling ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { cryptography dnspython kerbad - msldap-bad + badldap winacl ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 26ba300d01f1..22b3143b797d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -259,6 +259,7 @@ mapAliases { mkdocs-macros = mkdocs-macros-plugin; # added 2025-09-02 mkdocs-minify = throw "'mkdocs-minify' has been renamed to/replaced by 'mkdocs-minify-plugin'"; # Converted to throw 2025-10-29 mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29 + msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06 multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29 mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25 net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1adfc1cad9f4..515ff03070b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1694,6 +1694,8 @@ self: super: with self; { badauth = callPackage ../development/python-modules/badauth { }; + badldap = callPackage ../development/python-modules/badldap { }; + badsecrets = callPackage ../development/python-modules/badsecrets { }; bagit = callPackage ../development/python-modules/bagit { }; @@ -9845,8 +9847,6 @@ self: super: with self; { msldap = callPackage ../development/python-modules/msldap { }; - msldap-bad = callPackage ../development/python-modules/msldap-bad { }; - mslex = callPackage ../development/python-modules/mslex { }; msmart-ng = callPackage ../development/python-modules/msmart-ng { };