Merge pull request #110151 from dotlambda/ldaptor-tests
This commit is contained in:
commit
0e21aef593
|
@ -3,12 +3,13 @@
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, twisted
|
, twisted
|
||||||
, passlib
|
, passlib
|
||||||
, pycrypto
|
|
||||||
, pyopenssl
|
, pyopenssl
|
||||||
, pyparsing
|
, pyparsing
|
||||||
, service-identity
|
, service-identity
|
||||||
, zope_interface
|
, zope_interface
|
||||||
, isPy3k
|
, isPy3k
|
||||||
|
, pythonAtLeast
|
||||||
|
, python
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
@ -21,13 +22,15 @@ buildPythonPackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface
|
twisted passlib pyopenssl pyparsing service-identity zope_interface
|
||||||
];
|
];
|
||||||
|
|
||||||
disabled = isPy3k;
|
# https://github.com/twisted/ldaptor/pull/210
|
||||||
|
disabled = !isPy3k || pythonAtLeast "3.9";
|
||||||
|
|
||||||
# TypeError: None is neither bytes nor unicode
|
checkPhase = ''
|
||||||
doCheck = false;
|
${python.interpreter} -m twisted.trial ldaptor
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A Pure-Python Twisted library for LDAP";
|
description = "A Pure-Python Twisted library for LDAP";
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }:
|
{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "privacyidea-ldap-proxy";
|
pname = "privacyidea-ldap-proxy";
|
||||||
version = "0.6.1";
|
version = "0.6.1";
|
||||||
|
|
||||||
|
# https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50
|
||||||
|
disabled = isPy3k;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "privacyidea";
|
owner = "privacyidea";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
|
|
Loading…
Reference in a new issue