diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-03 01:02:51 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-03 01:02:51 +0300 |
| commit | e2c6740c37428f8d8185fcc907e9e619df50be85 (patch) | |
| tree | 13ed3247bd3f8d63305badcdf36557704e663478 /pkgs/development/libraries/openldap | |
| parent | a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15 (diff) | |
| parent | adaee7352bcbcaafaddf7f0a5ef8b65099e06f6e (diff) | |
| download | nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.gz nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.bz2 nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.lz nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.xz nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.zst nixpkgs-e2c6740c37428f8d8185fcc907e9e619df50be85.zip | |
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
Diffstat (limited to 'pkgs/development/libraries/openldap')
| -rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 0e4d60062e4..a99cc51de4a 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # TODO: separate "out" and "bin" - outputs = [ "out" "dev" "man" "docdev" ]; + outputs = [ "out" "dev" "man" "devdoc" ]; enableParallelBuilding = true; |