public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into closure-size

Browse Source 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
This commit is contained in:
Vladimír Čunát
2016-04-10 11:17:52 +02:00
parent 50fccad582 2463e09173
commit 30f14243c3
344 changed files with 58220 additions and 29215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/openldap/default.nix
+2 -14
View File
@@ -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" ];