diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2019-04-05 19:29:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-05 19:29:18 +0200 |
commit | 24406568e6264c197ed3d5b53475fc29c3a495e8 (patch) | |
tree | 197b2efa678f89037189eca785d11b63c10b22a6 /pkgs | |
parent | 4b6a9628c903753a1a8581dd6aec43f170c42410 (diff) | |
parent | 836621f33b5d2895eac72f59f172ca508ef6b1ef (diff) | |
download | nixpkgs-24406568e6264c197ed3d5b53475fc29c3a495e8.tar nixpkgs-24406568e6264c197ed3d5b53475fc29c3a495e8.tar.gz nixpkgs-24406568e6264c197ed3d5b53475fc29c3a495e8.tar.bz2 nixpkgs-24406568e6264c197ed3d5b53475fc29c3a495e8.tar.lz nixpkgs-24406568e6264c197ed3d5b53475fc29c3a495e8.tar.xz nixpkgs-24406568e6264c197ed3d5b53475fc29c3a495e8.tar.zst nixpkgs-24406568e6264c197ed3d5b53475fc29c3a495e8.zip |
Merge pull request #58833 from r-ryantm/auto-update/python3.7-python-ldap
python37Packages.ldap: 3.1.0 -> 3.2.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/ldap/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/python-modules/ldappool/default.nix | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 09d399d25b3..8f5cd7e7e88 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5"; + sha256 = "13nvrhp85yr0jyxixcjj012iw8l9wynxxlykm9j3alss6waln73x"; }; propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; @@ -28,4 +28,10 @@ buildPythonPackage rec { ''; doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + description = "Python modules for implementing LDAP clients"; + homepage = https://www.python-ldap.org/; + license = licenses.psfl; + }; } diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 460d743b1ed..3ad0ae3b723 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pbr, ldap, fixtures, testresources, testtools }: +, pbr, ldap, prettytable, fixtures, testresources, testtools }: buildPythonPackage rec { name = "ldappool-${version}"; @@ -11,9 +11,14 @@ buildPythonPackage rec { sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3"; }; + postPatch = '' + # Tests run without most of the dependencies + echo "" > test-requirements.txt + ''; + nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ ldap ]; + propagatedBuildInputs = [ ldap prettytable ]; checkInputs = [ fixtures testresources testtools ]; |