1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Commit graph

37 commits

Author SHA1 Message Date
Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.

Conflicts:
	pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
Tuomas Tynkkynen 8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Eelco Dolstra c861feee18 openldap: Get rid of runtime dependency on gcc
The problem here was that the openldap binaries had /tmp/... in their
RPATH *before* $out/lib, so patchelf --shrink-rpath considered the
$out/lib entry unused.

As a workaround, use NIX_LDFLAGS_BEFORE to ensure a proper order.
2016-09-01 11:43:30 +02:00
Eelco Dolstra 8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Guillaume Maudoux 63ab4ebf8d openldap: do strip, with proper fix
[dezgeg: Add comment about the proper fix in patchelf]
2016-08-31 23:08:32 +03:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Rickard Nilsson 4e706a13c8 openldap: Remove unused patch 2016-05-25 16:32:52 +00:00
Rickard Nilsson 92ce529880 Revert "openldap: Remove dontPatchELF"
This reverts commit 366c1e88fc, that
caused OpenLDAP to not find its own libs. See discussion in
366c1e88fc
2016-05-25 16:31:23 +00:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Rickard Nilsson efe33d6e87 openldap: 2.4.42 -> 2.4.44 2016-04-01 08:51:37 +02:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
janus a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
Tuomas Tynkkynen b4118c7f04 openldap: Split into multiple outputs
Also fix the incorrect .la file fixups.
2015-10-28 10:23:00 +01:00
Tuomas Tynkkynen 366c1e88fc openldap: Remove dontPatchELF
Everything still seems to build fine.
2015-10-28 10:23:00 +01:00
William A. Kennington III 6634bdc93c openldap: Fix CVE-2015-6908 2015-09-17 14:22:51 -07:00
William A. Kennington III 15a6f0ba7b openldap: Fix hash 2015-08-18 12:35:51 -07:00
William A. Kennington III ecdda8ddc9 openldap: 2.4.41 -> 2.4.42 2015-08-18 11:35:37 -07:00
Eelco Dolstra e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
William A. Kennington III 98eebe7ee4 openldap: 2.4.40 -> 2.4.41 2015-07-01 00:54:46 -07:00
William A. Kennington III ebb2e41611 openldap: Add gcc5 compat patch 2015-06-17 17:51:12 -07:00
Luca Bruno ec498cf022 openldap: fix broken .la files 2015-05-05 18:02:18 +02:00
Michael Weiss fd5f455a73 Update OpenLDAP from 2.4.39 to 2.4.40 2014-10-25 15:34:48 +02:00
Jason "Don" O'Conal a20b4cbbba openldap: fix build on darwin 2014-09-01 13:55:46 +10:00
Florian Friesdorf 42ee3b2478 openldap - speedup build 2014-08-27 11:55:42 +02:00
Lengyel Balázs 5f025b6505 Changed URL to upstream, as the old URL was dead 2014-05-04 19:58:16 +02:00
Rickard Nilsson fe7599b2b2 openldap: Update from 2.4.38 to 2.4.39 2014-04-10 14:10:33 +02:00
William A. Kennington III bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Evgeny Egorochkin b98014f7e5 openldap: update from 2.4.35 to 2.4.38 2014-02-04 21:58:25 +02:00
Petr Rockai 4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Rickard Nilsson a49aeec10d openldap: Upgrade to 2.4.35 2013-07-10 08:49:54 +02:00
Florian Friesdorf 1c86db4bc3 openldap: support building without cyrus-sasl and tls 2013-03-19 19:14:47 +01:00
Florian Friesdorf 4ab9c00850 openldap-2.4.34 2013-03-19 19:14:47 +01:00
Peter Simons f47c5d6bd7 openldap: update to version 2.4.31 2012-07-07 08:47:19 +02:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra 6f29bd14bc * OpenLDAP updated to 2.4.13. Also a workaround for a header problem.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14050
2009-02-12 19:51:51 +00:00
Yury G. Kudryashov 203c236135 Added slapd to openldap
svn path=/nixpkgs/trunk/; revision=9456
2007-10-12 20:30:19 +00:00
Eelco Dolstra f866d0c0bd * Added openldap and pam_ldap.
svn path=/nixpkgs/trunk/; revision=7641
2007-01-11 21:55:29 +00:00