From 14a65c5ecdaa68ee811a686c9c6ace3bf6710eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 13 Jan 2017 16:21:37 +0100 Subject: [PATCH] pythonPackages.ldap: 2.4.19 -> 2.4.22 --- pkgs/development/python-modules/ldap.nix | 15 +++++++++++++++ pkgs/top-level/python-packages.nix | 13 ++----------- 2 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/ldap.nix diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix new file mode 100644 index 00000000000..95243f52a38 --- /dev/null +++ b/pkgs/development/python-modules/ldap.nix @@ -0,0 +1,15 @@ +{ buildPythonPackage, isPy3k, fetchurl +, openldap, cyrus_sasl, openssl }: + +buildPythonPackage rec { + name = "ldap-2.4.22"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz"; + sha256 = "1dshpq84kl4xpa0hmnjrh6q5h5bybn09r83sa3z3ybr9jlm8gxcy"; + }; + + NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl"; + propagatedBuildInputs = [openldap cyrus_sasl openssl]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fcfe8bebadf..db000770a73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21164,17 +21164,8 @@ in { }; }); - ldap = buildPythonPackage rec { - name = "ldap-2.4.19"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz"; - sha256 = "0j5hzaar4d0vhnrlpmkczgwm7ci2wibr99a7zx04xddzrhxdpz82"; - }; - - NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev}/include/sasl"; - propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl]; + ldap = callPackage ../development/python-modules/ldap.nix { + inherit (pkgs) openldap cyrus_sasl openssl; }; ldap3 = buildPythonPackage rec {