forked from mirrors/nixpkgs
Merge pull request #195077 from OPNA2608/fix/python-ldap_rename_fixups
This commit is contained in:
commit
ea71ebd1c3
|
@ -1,6 +1,6 @@
|
||||||
{ lib, fetchFromGitHub, buildPythonPackage, aioredis, aiofiles, django_3
|
{ lib, fetchFromGitHub, buildPythonPackage, aioredis, aiofiles, django_3
|
||||||
, fastapi, msgpack, pynacl, typing-extensions
|
, fastapi, msgpack, pynacl, typing-extensions
|
||||||
, withLdap ? true, ldap }:
|
, withLdap ? true, python-ldap }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "etebase-server";
|
pname = "etebase-server";
|
||||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||||
msgpack
|
msgpack
|
||||||
pynacl
|
pynacl
|
||||||
typing-extensions
|
typing-extensions
|
||||||
] ++ lib.optional withLdap ldap;
|
] ++ lib.optional withLdap python-ldap;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin $out/lib
|
mkdir -p $out/bin $out/lib
|
||||||
|
|
|
@ -26,9 +26,9 @@ let
|
||||||
mailmanEnv = self.python3.withPackages
|
mailmanEnv = self.python3.withPackages
|
||||||
(ps: [ mailman ps.psycopg2 ]
|
(ps: [ mailman ps.psycopg2 ]
|
||||||
++ lib.optional withHyperkitty mailman-hyperkitty
|
++ lib.optional withHyperkitty mailman-hyperkitty
|
||||||
++ lib.optionals withLDAP [ ps.ldap ps.django-auth-ldap ]);
|
++ lib.optionals withLDAP [ ps.python-ldap ps.django-auth-ldap ]);
|
||||||
webEnv = self.python3.withPackages
|
webEnv = self.python3.withPackages
|
||||||
(ps: [ web ps.psycopg2 ] ++ lib.optionals withLDAP [ ps.ldap ps.django-auth-ldap ]);
|
(ps: [ web ps.psycopg2 ] ++ lib.optionals withLDAP [ ps.python-ldap ps.django-auth-ldap ]);
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue