diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/development/python-modules/ldap/default.nix | |
parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip |
Merge staging into master
Diffstat (limited to 'pkgs/development/python-modules/ldap/default.nix')
-rw-r--r-- | pkgs/development/python-modules/ldap/default.nix | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 32f25eeda42c..c039bcc043a2 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,18 +1,21 @@ -{ lib, writeText, buildPythonPackage, isPy3k, fetchPypi -, openldap, cyrus_sasl, openssl, pytest, pyasn1 }: +{ lib, buildPythonPackage, fetchPypi +, pyasn1, pyasn1-modules, pytest +, openldap, cyrus_sasl }: buildPythonPackage rec { pname = "python-ldap"; - version = "2.5.2"; - name = "${pname}-${version}"; - disabled = isPy3k; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b8c134dfedaef0e6ff4a4b94277708dcadb758b448905a83b8946df077356ed2"; + sha256 = "86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1"; }; - checkInputs = [ pytest pyasn1 ]; + propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; + + buildInputs = [ openldap cyrus_sasl ]; + + checkInputs = [ pytest ]; checkPhase = '' # Needed by tests to setup a mockup ldap server. @@ -21,28 +24,6 @@ buildPythonPackage rec { export SLAPD="${openldap}/libexec/slapd" export SCHEMA="${openldap}/etc/schema" - # AssertionError: expected errno=107, got 57 -> nix sandbox related ? - py.test -k 'not TestLdapCExtension and \ - not Test01_SimpleLDAPObject and \ - not Test02_ReconnectLDAPObject' Tests/*.py + py.test ''; - - patches = lib.singleton (writeText "avoid-syslog.diff" '' - diff a/Lib/slapdtest.py b/Lib/slapdtest.py - --- a/Lib/slapdtest.py - +++ b/Lib/slapdtest.py - @@ -60,7 +60,8 @@ def combined_logger( - pass - # for writing to syslog - new_logger = logging.getLogger(log_name) - - if sys_log_format: - + # /dev/log does not exist in nix build environment. - + if False: - my_syslog_formatter = logging.Formatter( - fmt=' '.join((log_name, sys_log_format))) - my_syslog_handler = logging.handlers.SysLogHandler( - ''); - - NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl"; - propagatedBuildInputs = [openldap cyrus_sasl openssl]; } |