From 832aeb66f87fdd2fda341f2c58df570ac05e09c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jun 2015 21:33:51 +0200 Subject: [PATCH] Revert "Fix krb5 reference" This reverts commit 9f0da5315b4595c45ace01727808e2ae8750efc0. --- pkgs/servers/ldap/389/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 33d63f6ee03..685d365ed18 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl -, svrcore, icu, net_snmp, libkrb5, pcre, perlPackages +, svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let version = "1.3.3.9"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu - net_snmp libkrb5 pcre + net_snmp kerberos pcre ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90d75a8948..d3bf954a73b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8588,7 +8588,7 @@ let ### SERVERS "389-ds-base" = callPackage ../servers/ldap/389 { - kerberos = libkrb5; + kerberos = krb5; }; rdf4store = callPackage ../servers/http/4store { };