diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-30 16:08:21 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-30 16:08:21 +0200 |
| commit | 538aa0f808479dcf04d1931e07a4e02c872a260a (patch) | |
| tree | ce7dec8bb4ce4219185547c22a2d1642a78f734d /pkgs/development/python-modules | |
| parent | 30ce98bbc3368027875983f27be72d4a038733aa (diff) | |
| parent | 595141d71084b49466ff15105d00f715413c43ee (diff) | |
| download | nixlib-538aa0f808479dcf04d1931e07a4e02c872a260a.tar nixlib-538aa0f808479dcf04d1931e07a4e02c872a260a.tar.gz nixlib-538aa0f808479dcf04d1931e07a4e02c872a260a.tar.bz2 nixlib-538aa0f808479dcf04d1931e07a4e02c872a260a.tar.lz nixlib-538aa0f808479dcf04d1931e07a4e02c872a260a.tar.xz nixlib-538aa0f808479dcf04d1931e07a4e02c872a260a.tar.zst nixlib-538aa0f808479dcf04d1931e07a4e02c872a260a.zip | |
Merge branch 'staging' (early part)
The comparison looks nice on Hydra.
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/ldap.nix | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix index 3e715bbe419a..0e1d8e73a841 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, fetchPypi +{ lib, writeText, buildPythonPackage, isPy3k, fetchPypi , openldap, cyrus_sasl, openssl }: buildPythonPackage rec { @@ -12,6 +12,28 @@ buildPythonPackage rec { sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779"; }; + # Needed by tests to setup a mockup ldap server. + BIN = "${openldap}/bin"; + SBIN = "${openldap}/bin"; + SLAPD = "${openldap}/libexec/slapd"; + SCHEMA = "${openldap}/etc/schema"; + + 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]; } |