Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 02032dbda496
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 595141d71084
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 29, 2017

  1. python-ldap: fixup tests for 2.4.38 update

    @layus
    layus committed May 29, 2017

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    dd5d63d View commit details

  2. Merge pull request #26204 from layus/fix-python-ldap 

    python-ldap: fixup tests for 2.4.38 update
    @FRidh
    FRidh authored May 29, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    GPG key ID: 22CBF5249D4B4D59
    Verified
    Learn about vigilant mode
    Copy the full SHA
    595141d View commit details
Showing with 23 additions and 1 deletion.
  1. +23 −1 pkgs/development/python-modules/ldap.nix
24 changes: 23 additions & 1 deletion pkgs/development/python-modules/ldap.nix
View file
Original file line number Diff line number Diff line change
@@ -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];
}