adding ldap example to test -N/--extra-env option

fixes #97

Author: garbas

.travis.yml

@@ -7,6 +7,7 @@ os:
 env:
   - EXAMPLE=awscli_and_requests
   - EXAMPLE=empy
+  - EXAMPLE=ldap
   - EXAMPLE=lektor
   - EXAMPLE=rss2email
   - EXAMPLE=scipy

examples/Makefile

@@ -15,23 +15,26 @@ endif
 all: \
 	awscli_and_requests \
 	empy \
+	ldap \
 	lektor \
 	rss2email \
 	scipy \
 	sentry \
-	vulnix \
-	tornado
+	tornado \
+	vulnix
 
 clear: \
 	awscli_and_requests-clear \
 	empy-clear \
+	ldap_clear \
 	lektor-clear \
 	pypi2nix-clear \
 	rss2email-clear \
 	scipy-clear \
 	sentry-clear \
-	vulnix-clear \
-	tornado-clear
+	tornado-clear \
+	vulnix-clear
+
 
 pypi2nix-clear:
 	@rm -f ../result
@@ -238,3 +241,32 @@ tornado-clear:
 	@rm -f tornado.nix
 	@rm -f tornado_generated.nix
 	@rm -f tornado_frozen.txt
+
+
+ldap: ldap.nix
+	@echo "building and testing ldap..."
+	@nix-build ldap.nix -o ldap -A interpreter --show-trace
+	@./ldap/bin/python -c 'import ldap'
+	@nix-shell ldap.nix -A interpreter --run "python -c 'import ldap'"
+
+ldap.nix: ldap.txt $(PYPI2NIX)
+	@echo "generating ldap.nix expressions ..."
+	@$(PYPI2NIX) \
+		-v \
+		--basename ldap \
+		-N "NIX_CFLAGS_COMPILE=\"-I\$${pkgs.cyrus_sasl.dev}/include/sasl \$$NIX_CFLAGS_COMPILE\"" \
+		-E "openldap cyrus_sasl openssl" \
+		--setup-requires "six packaging appdirs" \
+		-r ldap.txt \
+		-I $(NIX_PATH) \
+		-V "2.7"
+
+ldap.txt: ldap-clear
+	@echo "python-ldap" > ldap.txt
+
+ldap-clear:
+	@rm -f ldap
+	@rm -f ldap.txt
+	@rm -f ldap.nix
+	@rm -f ldap_generated.nix
+	@rm -f ldap_frozen.txt

examples/ldap_override.nix

@@ -0,0 +1,9 @@
+{ pkgs, python }:
+
+self: super: {
+
+   "python-ldap" = python.overrideDerivation super."python-ldap" (old: {
+      NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev}/include/sasl";
+   });
+
+}

src/pypi2nix/stage1.py

@@ -27,6 +27,27 @@ def main(verbose,
        a user provided requirements.txt.
     """
 
+
+    if extra_env:
+        nix_instantiate = 'nix-instantiate'
+        if os.path.exists(nix_shell):
+            nix_instantiate = \
+                os.path.abspath(os.path.join(
+                    os.path.dirname(nix_path),
+                    nix_instantiate
+                ))
+        command_env = '%s --eval --expr \'let pkgs = import <nixpkgs> {}; in "%s"\'' % (
+
+            nix_instantiate,
+            extra_env.replace('"', '\\"')
+        )
+        returncode, output = pypi2nix.utils.cmd(command_env, verbose != 0)
+        if returncode != 0:
+            if verbose == 0:
+                click.echo(output)
+            raise click.ClickException('Failed to interpret extra_env')
+        extra_env = output.split('\n')[-2].strip()[1:-1]
+
     command = '{nix_shell} {nix_file} {options} {nix_path} --show-trace --pure --run exit'.format(  # noqa
         nix_shell=nix_shell,
         nix_file=os.path.join(os.path.dirname(__file__), 'pip.nix'),