diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 2e688abdfb07..7cac3573e5a6 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,8 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, - isPy27, + fetchFromGitHub, # buildtime setuptools-scm, @@ -12,36 +11,40 @@ python-ldap, # tests - python, - pkgs, + openldap, }: buildPythonPackage rec { pname = "django-auth-ldap"; - version = "4.8.0"; - format = "pyproject"; + version = "5.1.0"; + pyproject = true; - disabled = isPy27; - - src = fetchPypi { - inherit pname version; - hash = "sha256-YEJQk43cn9phnyR8elmwsvBuU6fT9GoVbyiqMN1xpzg="; + src = fetchFromGitHub { + owner = "django-auth-ldap"; + repo = "django-auth-ldap"; + tag = version; + hash = "sha256-uOxncRsBwy+1ynESku7+5yaY1MPIo4V8ppE2zfcDkws="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ django python-ldap ]; - # ValueError: SCHEMADIR is None, ldap schemas are missing. + # Duplicate attributeType: "MSADat2:102"\nslapadd: could not add entry dn="cn={4}msuser,cn=schema,cn=config" (line=1): \xd0\xbe\xff\xff\xff\x7f\n' doCheck = false; + preCheck = '' + export PATH=${openldap}/bin:${openldap}/libexec:$PATH + export SCHEMA=${openldap}/etc/schema + export DJANGO_SETTINGS_MODULE=tests.settings + ''; + checkPhase = '' runHook preCheck - export PATH=${pkgs.openldap}/bin:${pkgs.openldap}/libexec:$PATH - ${python.interpreter} -m django test --settings tests.settings + python -m django test --settings tests.settings runHook postCheck ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8b1972b28f7..030d6f0fb337 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3415,7 +3415,9 @@ self: super: with self; { django-auditlog = callPackage ../development/python-modules/django-auditlog { }; - django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; + django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { + inherit (pkgs) openldap; + }; django-autocomplete-light = callPackage ../development/python-modules/django-autocomplete-light { };