From dcb501f99325920c7f9df536b738f863c12a165e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 14 Mar 2021 17:11:48 +0100 Subject: [PATCH] kerberos: deprecate alias --- pkgs/applications/misc/azuredatastudio/default.nix | 4 ++-- .../networking/browsers/chromium/common.nix | 4 ++-- .../networking/browsers/firefox-bin/default.nix | 4 ++-- .../networking/browsers/firefox/common.nix | 4 ++-- .../networking/browsers/firefox/wrapper.nix | 4 ++-- .../networking/browsers/google-chrome/default.nix | 4 ++-- .../networking/cluster/openshift/default.nix | 4 ++-- .../networking/mailreaders/alpine/default.nix | 4 ++-- .../networking/mailreaders/mutt/default.nix | 4 ++-- .../networking/mailreaders/neomutt/default.nix | 4 ++-- .../networking/mailreaders/thunderbird-bin/68.nix | 4 ++-- .../mailreaders/thunderbird-bin/default.nix | 4 ++-- .../networking/remote/aws-workspaces/default.nix | 4 ++-- .../gnome-3/core/evolution-data-server/default.nix | 4 ++-- pkgs/development/libraries/cyrus-sasl/default.nix | 4 ++-- .../libraries/gnome-online-accounts/default.nix | 4 ++-- pkgs/development/libraries/gsasl/default.nix | 4 ++-- pkgs/development/libraries/libgssglue/default.nix | 4 ++-- pkgs/development/libraries/serf/default.nix | 6 +++--- .../libraries/unixODBCDrivers/default.nix | 4 ++-- pkgs/development/python-modules/kerberos/default.nix | 4 ++-- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++-- pkgs/os-specific/linux/autofs/default.nix | 4 ++-- pkgs/os-specific/linux/cifs-utils/default.nix | 4 ++-- pkgs/os-specific/linux/ipsec-tools/default.nix | 4 ++-- pkgs/os-specific/linux/nfs-utils/default.nix | 12 ++++++------ pkgs/os-specific/linux/pam_krb5/default.nix | 4 ++-- pkgs/os-specific/linux/sssd/default.nix | 4 ++-- pkgs/servers/ldap/389/default.nix | 4 ++-- pkgs/servers/openafs/1.8/default.nix | 4 ++-- pkgs/servers/openafs/1.8/module.nix | 5 ++--- pkgs/servers/openafs/1.9/default.nix | 4 ++-- pkgs/servers/openafs/1.9/module.nix | 5 ++--- pkgs/tools/filesystems/irods/common.nix | 4 ++-- pkgs/tools/filesystems/irods/default.nix | 4 ++-- pkgs/tools/networking/maxscale/default.nix | 4 ++-- pkgs/tools/networking/openssh/common.nix | 12 ++++++------ pkgs/tools/security/john/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 ++----- pkgs/top-level/python-packages.nix | 4 +--- 41 files changed, 89 insertions(+), 95 deletions(-) diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 9472af7a16fe..56894a29a662 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -12,7 +12,7 @@ , at-spi2-atk , gnutar , atomEnv -, kerberos +, libkrb5 }: # from justinwoo/azuredatastudio-nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { at-spi2-core at-spi2-atk stdenv.cc.cc.lib - kerberos + libkrb5 ] ) targetPath diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3197e272f0e2..8d0a59f29190 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -8,7 +8,7 @@ , libusb1, pciutils, nss, re2 , python2Packages, perl, pkg-config -, nspr, systemd, kerberos +, nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf , glib, gtk3, dbus-glib @@ -135,7 +135,7 @@ let buildInputs = defaultDependencies ++ [ nspr nss systemd util-linux alsaLib - bison gperf kerberos + bison gperf libkrb5 glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 72e9746421b3..93b89e9031e0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -13,7 +13,7 @@ , glibc , gtk2 , gtk3 -, kerberos +, libkrb5 , libX11 , libXScrnSaver , libxcb @@ -106,7 +106,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 mesa libX11 libXScrnSaver diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ad9a4618dc81..3a8fec2c6efa 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -24,7 +24,7 @@ , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libxkbcommon , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages -, gssSupport ? true, kerberos +, gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire ## privacy-related options @@ -174,7 +174,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 - ++ lib.optional gssSupport kerberos + ++ lib.optional gssSupport libkrb5 ++ lib.optional waylandSupport libxkbcommon ++ lib.optional pipewireSupport pipewire ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ed88bf587d5f..26fb49ef2a3e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , tridactyl-native , fx_cast_bridge , udev -, kerberos +, libkrb5 , libva , mesa # firefox wants gbm for drm+dmabuf }: @@ -65,7 +65,7 @@ let libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ] ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional gssSupport kerberos + ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index b208ebf2ab03..d903cb3c0831 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,7 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core -, kerberos, libdrm, mesa +, libkrb5, libdrm, mesa , libxkbcommon, wayland # ozone/wayland # Command line programs @@ -66,7 +66,7 @@ let liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - kerberos libdrm mesa coreutils + libkrb5 libdrm mesa coreutils libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 53209d2edd67..a1d4b1468376 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux -, coreutils, kerberos, ncurses, clang, installShellFiles +, coreutils, libkrb5, ncurses, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -33,7 +33,7 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 62882818d726..d169e1fdea65 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos +{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, libkrb5 , openldap }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses tcl openssl pam kerberos openldap + ncurses tcl openssl pam libkrb5 openldap ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index eecf8f0f67e1..27c06c95d993 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -4,7 +4,7 @@ , cyrus_sasl ? null , gnupg ? null , gpgme ? null -, kerberos ? null +, libkrb5 ? null , headerCache ? true , sslSupport ? true , saslSupport ? true @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ ncurses which perl ] ++ optional headerCache gdbm ++ optional sslSupport openssl - ++ optional gssSupport kerberos + ++ optional gssSupport libkrb5 ++ optional saslSupport cyrus_sasl ++ optional gpgmeSupport gpgme; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 0c02f512dad9..b2187371f299 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which -, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl +, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cyrus_sasl gss gpgme kerberos libidn ncurses + cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb mailcap sqlite ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index 5e2c74fb3f1a..dda6abac8e56 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -16,7 +16,7 @@ , glibc , gtk2 , gtk3 -, kerberos +, libkrb5 , libX11 , libXScrnSaver , libXcomposite @@ -94,7 +94,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 libX11 libXScrnSaver libXcomposite diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f9027285c137..d16cbfc1bca0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -20,7 +20,7 @@ , gpgme , gtk2 , gtk3 -, kerberos +, libkrb5 , libcanberra , libGL , libGLU @@ -93,7 +93,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 libX11 libXScrnSaver libXcomposite diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix index acfacadd55e3..96c66f054e25 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -1,6 +1,6 @@ { stdenv, lib , makeWrapper, dpkg, fetchurl, autoPatchelfHook -, curl, kerberos, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking +, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc.lib - kerberos + libkrb5 curl lttng-ust libpulseaudio diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index b943a02a56f5..dc43bdfd4932 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit , db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja -, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber +, libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber , gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libsoup libxml2 gtk3 gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib - icu sqlite kerberos openldap webkitgtk glib-networking + icu sqlite libkrb5 openldap webkitgtk glib-networking libcanberra-gtk3 pcre libphonenumber boost protobuf ]; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index b1a6401284ac..6e97c61a6a5e 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext +{ lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles, fetchpatch }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = - [ openssl db gettext kerberos ] + [ openssl db gettext libkrb5 ] ++ lib.optional enableLdap openldap ++ lib.optional stdenv.isLinux pam; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 824d5c383182..ab71b2ccf9a9 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -22,7 +22,7 @@ , docbook_xml_dtd_412 , gnome3 , gcr -, kerberos +, libkrb5 , gvfs , dbus , wrapGAppsHook @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { gvfs # OwnCloud, Google Drive icu json-glib - kerberos + libkrb5 librest libsecret libsoup diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 9b6562b9891f..fc2edc187129 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libidn, kerberos }: +{ fetchurl, lib, stdenv, libidn, libkrb5 }: stdenv.mkDerivation rec { name = "gsasl-1.10.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; }; - buildInputs = [ libidn kerberos ]; + buildInputs = [ libidn libkrb5 ]; configureFlags = [ "--with-gssapi-impl=mit" ]; diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 678af459a30d..d4bf3ff1c2bb 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kerberos }: +{ lib, stdenv, fetchurl, libkrb5 }: stdenv.mkDerivation rec { name = "libgssglue-0.4"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/etc cat < $out/etc/gssapi_mech.conf - ${kerberos}/lib/libgssapi_krb5.so mechglue_internal_krb5_init + ${libkrb5}/lib/libgssapi_krb5.so mechglue_internal_krb5_init EOF ''; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 5b603e6a0c7f..2549704c1a8c 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos +{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5 , pkg-config, libiconv }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ lib.optional (!stdenv.isCygwin) kerberos; + ++ lib.optional (!stdenv.isCygwin) libkrb5; patches = [ ./scons.patch ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sconsFlags+=" OPENSSL=${openssl}" sconsFlags+=" ZLIB=${zlib}" '' + lib.optionalString (!stdenv.isCygwin) '' - sconsFlags+=" GSSAPI=${kerberos.dev}" + sconsFlags+=" GSSAPI=${libkrb5.dev}" ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index faf74bcab477..c8cf475029dd 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, libuuid, patchelf, libiconv, fetchFromGitHub }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad @@ -157,7 +157,7 @@ ''; postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out kerberos libuuid stdenv.cc.cc ]} \ + patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out libkrb5 libuuid stdenv.cc.cc ]} \ $out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional} ''; diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index 7a9ce3aab448..c4772d606518 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, kerberos +, libkrb5 }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "cdd046142a4e0060f96a00eb13d82a5d9ebc0f2d7934393ed559bac773460a2c"; }; - nativeBuildInputs = [ kerberos ]; + nativeBuildInputs = [ libkrb5 ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 6d8313954c3a..3f1c2190a3c2 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -17,7 +17,7 @@ # This seperates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). -{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which +{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl @@ -607,7 +607,7 @@ in }; timfel-krb5-auth = attrs: { - buildInputs = [ kerberos ]; + buildInputs = [ libkrb5 ]; }; tiny_tds = attrs: { diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index f7ca3f71d434..3055a91161b3 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs -, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: +, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: let version = "5.1.6"; @@ -36,7 +36,7 @@ in stdenv.mkDerivation { #make install SUBDIRS="samples" # impure! ''; - buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd + buildInputs = [ linuxHeaders libtirpc libxml2 libkrb5 kmod openldap sssd openssl cyrus_sasl rpcsvc-proto ]; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index c4ed4d4fc0f3..38f958fe9dd3 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config -, kerberos, keyutils, pam, talloc, python3 }: +, libkrb5, keyutils, pam, talloc, python3 }: stdenv.mkDerivation rec { pname = "cifs-utils"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook docutils pkg-config ]; - buildInputs = [ kerberos keyutils pam talloc python3 ]; + buildInputs = [ libkrb5 keyutils pam talloc python3 ]; configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 4e0ae7955bee..33152cc51c13 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }: +{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, libkrb5, 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 kerberos pam ]; + buildInputs = [ readline openssl flex libkrb5 pam ]; patches = [ ./dont-create-localstatedir-during-install.patch diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index c2d2996c54dc..7b5f6e720018 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent -, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers +, sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , python3, buildPackages, nixosTests, rpcsvc-proto , enablePython ? true }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtirpc libcap libevent sqlite lvm2 - libuuid keyutils kerberos tcp_wrappers + libuuid keyutils libkrb5 tcp_wrappers ] ++ lib.optional enablePython python3; enableParallelBuilding = true; @@ -33,15 +33,15 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure \ - --replace '$dir/include/gssapi' ${lib.getDev kerberos}/include/gssapi \ - --replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config + --replace '$dir/include/gssapi' ${lib.getDev libkrb5}/include/gssapi \ + --replace '$dir/bin/krb5-config' ${lib.getDev libkrb5}/bin/krb5-config ''; configureFlags = [ "--enable-gss" "--enable-svcgss" "--with-statedir=/var/lib/nfs" - "--with-krb5=${lib.getLib kerberos}" + "--with-krb5=${lib.getLib libkrb5}" "--with-systemd=${placeholder "out"}/etc/systemd/system" "--enable-libmount-mount" "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { # https://bugzilla.kernel.org/show_bug.cgi?id=203793 doCheck = false; - disallowedReferences = [ (lib.getDev kerberos) ]; + disallowedReferences = [ (lib.getDev libkrb5) ]; passthru.tests = { nfs3-simple = nixosTests.nfs3.simple; diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index c0b8ce272d7a..cb04fa5b4242 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pam, kerberos }: +{ lib, stdenv, fetchurl, pam, libkrb5 }: stdenv.mkDerivation rec { name = "pam-krb5-4.10"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79"; }; - buildInputs = [ pam kerberos ]; + buildInputs = [ pam libkrb5 ]; meta = with lib; { homepage = "https://www.eyrie.org/~eagle/software/pam-krb5/"; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 2973b87210bf..d768546b12bb 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap, - pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, + pcre, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, nss_wrapper, ncurses, Po4a, http-parser, jansson, docbook_xsl, docbook_xml_dtd_44, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss samba nfs-utils doxygen python python3 popt - talloc tdb tevent pkg-config ldb pam openldap pcre kerberos + talloc tdb tevent pkg-config ldb pam openldap pcre libkrb5 cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 90510d502525..db9041574fca 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap -, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python3 +, db, cyrus_sasl, svrcore, icu, net-snmp, libkrb5, pcre, perlPackages, libevent, openssl, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu - net-snmp kerberos pcre libevent openssl python3 + net-snmp libkrb5 pcre libevent openssl python3 ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); patches = [ diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index f7944e6a1752..7f8dba34e257 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex -, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file +, yacc , glibc, perl, libkrb5, libxslt, docbook_xsl, file , docbook_xml_dtd_43, libtool_2 , withDevdoc ? false, doxygen, dblatex # Extra developer documentation , ncurses # Extra ncurses utilities. Needed for debugging and monitoring. @@ -18,7 +18,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl which yacc ] ++ optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 1bb6ee32396b..82f19a600ce3 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: +, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; - buildInputs = [ kerberos ]; + buildInputs = [ libkrb5 ]; patches = [ # LINUX 5.8: Replace kernel_setsockopt with new funcs @@ -91,5 +91,4 @@ in stdenv.mkDerivation { maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; - } diff --git a/pkgs/servers/openafs/1.9/default.nix b/pkgs/servers/openafs/1.9/default.nix index f7944e6a1752..7f8dba34e257 100644 --- a/pkgs/servers/openafs/1.9/default.nix +++ b/pkgs/servers/openafs/1.9/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex -, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file +, yacc , glibc, perl, libkrb5, libxslt, docbook_xsl, file , docbook_xml_dtd_43, libtool_2 , withDevdoc ? false, doxygen, dblatex # Extra developer documentation , ncurses # Extra ncurses utilities. Needed for debugging and monitoring. @@ -18,7 +18,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl which yacc ] ++ optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch; diff --git a/pkgs/servers/openafs/1.9/module.nix b/pkgs/servers/openafs/1.9/module.nix index 5ed09a21742d..0d5d56ccf182 100644 --- a/pkgs/servers/openafs/1.9/module.nix +++ b/pkgs/servers/openafs/1.9/module.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: +, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; - buildInputs = [ kerberos ]; + buildInputs = [ libkrb5 ]; patches = []; @@ -60,5 +60,4 @@ in stdenv.mkDerivation { maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; - } diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 7b7eb7ba05a9..77c05a616662 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: +{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: # Common attributes of irods packages { nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; - buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ]; + buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost libcxx catch2 ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index fe7a0d73f673..cbc9f19c664a 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: +{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: let avro-cpp=avro-cpp_llvm; @@ -7,7 +7,7 @@ let common = import ./common.nix { inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive jansson - zeromq openssl pam libiodbc kerberos gcc libcxx + zeromq openssl pam libiodbc libkrb5 gcc libcxx boost avro-cpp which catch2; }; in rec { diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index c4e16ef8b1ce..bef421a7ab4c 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, glibc -, bison, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient +, bison, curl, flex, gperftools, jansson, jemalloc, libkrb5, lua, libmysqlclient , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - bison curl flex gperftools jansson jemalloc kerberos lua libmysqlclient + bison curl flex gperftools jansson jemalloc libkrb5 lua libmysqlclient ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl libaio libedit libtool libui libuuid zlib ]; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 53033b57442f..55babb4ca2dc 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -20,7 +20,7 @@ , pam , etcDir ? null , withKerberos ? true -, kerberos +, libkrb5 , libfido2 , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , linkOpenssl ? true @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ] - # This is not the same as the kerberos from the inputs! pkgs.kerberos is + # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is # needed here to access krb5-config in order to cross compile. See: # https://github.com/NixOS/nixpkgs/pull/107606 - ++ optional withKerberos pkgs.kerberos + ++ optional withKerberos pkgs.libkrb5 ++ extraNativeBuildInputs; buildInputs = [ zlib openssl libedit ] ++ optional withFIDO libfido2 - ++ optional withKerberos kerberos + ++ optional withKerberos libkrb5 ++ optional stdenv.isLinux pam; preConfigure = '' @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # Kerberos can be found either by krb5-config or by fall-back shell # code in openssh's configure.ac. Neither of them support static # build, but patching code for krb5-config is simpler, so to get it - # into PATH, kerberos.dev is added into buildInputs. + # into PATH, libkrb5.dev is added into buildInputs. + optionalString stdenv.hostPlatform.isStatic '' sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" ++ optional withFIDO "--with-security-key-builtin=yes" - ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") + ++ optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index b243e10d3531..e56e99909fff 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 +{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 , gcc, python3Packages, perl, perlPackages, makeWrapper }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "--with-systemwide" ]; - buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ]; + buildInputs = [ openssl nss nspr libkrb5 gmp zlib libpcap re2 ]; nativeBuildInputs = [ gcc python3Packages.wrapPython perl makeWrapper ]; propagatedBuildInputs = (with python3Packages; [ dpkt scapy lxml ]) ++ # For pcap2john.py (with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 59d7e3d33691..bf698045c19a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -337,6 +337,7 @@ mapAliases ({ kicad-with-packages3d = kicad; # added 2019-11-25 kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09 krename-qt5 = krename; # added 2017-02-18 + kerberos = libkrb5; # moved from top-level 2021-03-14 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f4b393399ee..53ddd52fec8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13911,7 +13911,7 @@ in cypress = callPackage ../development/web/cypress { }; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - kerberos = if stdenv.isFreeBSD then libheimdal else kerberos; + libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; }; # Make bdb5 the default as it is the last release under the custom @@ -14949,7 +14949,6 @@ in }; krb5Full = krb5; libkrb5 = krb5.override { type = "lib"; }; - kerberos = libkrb5; # TODO: move to aliases.nix l-smash = callPackage ../development/libraries/l-smash { stdenv = gccStdenv; @@ -18113,9 +18112,7 @@ in ### SERVERS - _389-ds-base = callPackage ../servers/ldap/389 { - kerberos = libkrb5; - }; + _389-ds-base = callPackage ../servers/ldap/389 { }; adguardhome = callPackage ../servers/adguardhome {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19442dff09d3..5d4ad074029b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3659,9 +3659,7 @@ in { keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - kerberos = callPackage ../development/python-modules/kerberos { - inherit (pkgs) kerberos; - }; + kerberos = callPackage ../development/python-modules/kerberos { }; keyring = if isPy3k then callPackage ../development/python-modules/keyring { }