diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
| commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
| tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /pkgs/development/libraries/openldap | |
| parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
| parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) | |
| download | nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.gz nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.bz2 nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.lz nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.xz nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.zst nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.zip | |
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
Diffstat (limited to 'pkgs/development/libraries/openldap')
| -rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index f0569332391..cc5a26a557d 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,25 +1,13 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff }: stdenv.mkDerivation rec { - name = "openldap-2.4.42"; + name = "openldap-2.4.44"; src = fetchurl { url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "0qwfpb5ipp2l76v11arghq5mr0sjc6xhjfg8a0kgsaw5qpib1dzf"; + sha256 = "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp"; }; - # Should be removed with >=2.4.43 - patches = [ - ./CVE-2015-6908.patch - ( - fetchurl { - sha256 = "5bcb3f9fb7186b380efa0a1c2d31ad755e190134b5c4dac07c65bbf7c0b6b3b3"; - url = "https://github.com/LMDB/lmdb/commit/3360cbad668f678fb23c064ca4efcc5c9ae95d10.patch"; - name = "openldap-clang-compilation.patch"; - } - ) - ]; - # TODO: separate "out" and "bin" outputs = [ "dev" "out" "man" "docdev" ]; |