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

kerberos: Use default kerberos instead of krb5

Browse Source
This commit is contained in:
William A. Kennington III 2014-12-30 00:05:12 -08:00 committed by Peter Simons
parent 75bc862b39
commit 5fe743930a
10 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -8,7 +8,7 @@
, libusb1, libexif, pciutils
, python, pythonPackages, perl, pkgconfig
, nspr, udev, krb5
, nspr, udev, kerberos
, utillinux, alsaLib
, bison, gperf
, glib, gtk, dbus_glib
@ -109,7 +109,7 @@ let
nspr udev
(if useOpenSSL then openssl else nss)
utillinux alsaLib
bison gperf krb5
bison gperf kerberos
glib gtk dbus_glib
libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage

4
pkgs/desktops/cinnamon/cinnamon-control-center.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify,
gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, pulseaudio, isocodes, krb5,
gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, pulseaudio, isocodes, kerberos,
libxkbfile}:
let
@ -25,7 +25,7 @@ stdenv.mkDerivation {
libnotify gnome-menus libxml2 systemd
upower cinnamon-settings-daemon colord
polkit ibus libcanberra_gtk3 pulseaudio
isocodes krb5 libxkbfile ];
isocodes kerberos libxkbfile ];
preBuild = "patchShebangs ./scripts";

4
pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
View File

@ -2,7 +2,7 @@
, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig
, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
, cracklib, python, krb5, networkmanagerapplet, networkmanager
, cracklib, python, kerberos, networkmanagerapplet, networkmanager
, libwacom, samba, shared_mime_info, tzdata, icu, libtool
, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
[ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
accountsservice kerberos networkmanagerapplet libwacom samba libnotify libxkbfile
shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino

4
pkgs/development/compilers/icedtea/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, jdk, jdkPath, ant, wget, zip, unzip, cpio, file, libxslt
, xorg, zlib, pkgconfig, libjpeg, libpng, giflib, lcms2, gtk2, krb5, attr
, xorg, zlib, pkgconfig, libjpeg, libpng, giflib, lcms2, gtk2, kerberos, attr
, alsaLib, procps, automake, autoconf, cups, which, perl, coreutils, binutils
, cacert, setJavaClassPath
}:
@ -50,7 +50,7 @@ with srcInfo; stdenv.mkDerivation {
buildInputs = [
jdk ant wget zip unzip cpio file libxslt pkgconfig procps automake
autoconf which perl coreutils xorg.lndir
zlib libjpeg libpng giflib lcms2 krb5 attr alsaLib cups
zlib libjpeg libpng giflib lcms2 kerberos attr alsaLib cups
xorg.libX11 xorg.libXtst gtk2
];

4
pkgs/development/libraries/ptlib/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, bison, flex, unixODBC
, openssl, openldap, cyrus_sasl, krb5, expat, SDL, libdv, libv4l, alsaLib }:
, openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }:
stdenv.mkDerivation rec {
name = "ptlib-2.10.10";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig bison flex unixODBC openssl openldap
cyrus_sasl krb5 expat SDL libdv libv4l alsaLib ];
cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ];
enableParallelBuilding = true;

6
pkgs/development/libraries/serf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig, gnused }:
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos, pkgconfig, gnused }:
stdenv.mkDerivation rec {
name = "serf-1.3.7";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c";
};
buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ];
buildInputs = [ apr scons openssl aprutil zlib kerberos pkgconfig ];
configurePhase = ''
${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \
APU="$(echo "${aprutil}"/bin/*-config)" GSSAPI="${krb5}" CC="${
APU="$(echo "${aprutil}"/bin/*-config)" GSSAPI="${kerberos}" CC="${
if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc"
}"
'';

4
pkgs/development/libraries/ti-rpc/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, krb5 }:
{ fetchurl, stdenv, kerberos }:
stdenv.mkDerivation rec {
name = "libtirpc-0.2.4";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "18a337wa4amf0k21wnimp3yzs5l3cxqndz4x3x8bm993zhfy5hs5";
};
buildInputs = [ krb5 ];
buildInputs = [ kerberos ];
# http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
preConfigure = ''

4
pkgs/os-specific/linux/ipsec-tools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, linuxHeaders, readline, openssl, flex, krb5, pam }:
{ stdenv, fetchurl, linuxHeaders, readline, openssl, flex, kerberos, pam }:
# TODO: These tools are supposed to work under NetBSD and FreeBSD as
# well, so I guess it's not appropriate to place this expression in
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf";
};
buildInputs = [ readline openssl flex krb5 pam ];
buildInputs = [ readline openssl flex kerberos pam ];
patches = [ ./dont-create-localstatedir-during-install.patch ];

4
pkgs/servers/openafs-client/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, which, autoconf, automake, flex, yacc,
kernel, glibc, ncurses, perl, krb5 }:
kernel, glibc, ncurses, perl, kerberos }:
assert stdenv.isLinux;
assert builtins.substring 0 4 kernel.version != "3.18";
@ -34,7 +34,7 @@ stdenv.mkDerivation {
./regen.sh
export KRB5_CONFIG=${krb5}/bin/krb5-config
export KRB5_CONFIG=${kerberos}/bin/krb5-config
configureFlagsArray=(
"--with-linux-kernel-build=$TMP/linux"

4
pkgs/tools/security/john/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchgit, openssl, nss, nspr, krb5, gmp, zlib, libpcap, re2 }:
{ stdenv, fetchgit, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "JohnTheRipper-${version}";
version = "8a3e3c1d";
buildInputs = [ openssl nss nspr krb5 gmp zlib libpcap re2 ];
buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ];
NIX_CFLAGS_COMPILE = "-DJOHN_SYSTEMWIDE=1";
preConfigure = ''cd src'';
installPhase = ''