BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #195077 from OPNA2608/fix/python-ldap_rename_fixups

Browse source
This commit is contained in:
Martin Weinelt 2022-10-08 15:22:07 +02:00 committed by GitHub
commit ea71ebd1c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/etebase/default.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, buildPythonPackage, aioredis, aiofiles, django_3
, fastapi, msgpack, pynacl, typing-extensions
, withLdap ? true, ldap }:
, withLdap ? true, python-ldap }:
buildPythonPackage rec {
pname = "etebase-server";
@ -24,7 +24,7 @@ buildPythonPackage rec {
msgpack
pynacl
typing-extensions
] ++ lib.optional withLdap ldap;
] ++ lib.optional withLdap python-ldap;
installPhase = ''
mkdir -p $out/bin $out/lib

4
pkgs/servers/mail/mailman/default.nix
View file

@ -26,9 +26,9 @@ let
mailmanEnv = self.python3.withPackages
(ps: [ mailman ps.psycopg2 ]
++ 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
(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 ]);
};
});