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

Revert "Use mit5 as kerberos since it is better supported"

Browse Source 
This reverts commit 80648d7e24.
This commit is contained in:
William A. Kennington III 2015-06-06 12:02:26 -07:00
parent 3d92654e13
commit 9882cecb10
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/top-level/all-packages.nix
View File

@ -6336,9 +6336,9 @@ let
hamlib = callPackage ../development/libraries/hamlib { }; hamlib = callPackage ../development/libraries/hamlib { };
# TODO : Add Heimdal Kerberos and let admin choose. # TODO : Add MIT Kerberos and let admin choose.
# Modularize heimdal into a library first # TODO : Fix kerberos on Darwin
kerberos = libkrb5; kerberos = if stdenv.isDarwin then null else heimdal;
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
openldap = openldap.override { openldap = openldap.override {
@ -6472,6 +6472,9 @@ let
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
openldap = openldap.override {
cyrus_sasl = cyrus_sasl.override { kerberos = null; };
};
inherit (darwin) bootstrap_cmds; inherit (darwin) bootstrap_cmds;
}; };
libkrb5 = krb5.override { libkrb5 = krb5.override {