diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 21:09:42 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:48 +0200 |
| commit | 1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0 (patch) | |
| tree | a78474e834311fe4542c58a578c8127e065d1dda /pkgs/tools/system | |
| parent | 1b32ae03f3be8c5233ddd7f7d7db2db6ef4d2f18 (diff) | |
| download | nixlib-1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0.tar nixlib-1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0.tar.gz nixlib-1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0.tar.bz2 nixlib-1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0.tar.lz nixlib-1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0.tar.xz nixlib-1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0.tar.zst nixlib-1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0.zip | |
Revert "krb5: 1.13.1 -> 1.13.2"
This reverts commit 85932bc5a998060e76090273b51d35133a7a2dbb.
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/rsyslog/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index e8abe0ef0d0a..195e6bc43294 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages -, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null +, krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls + krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis ] ++ stdenv.lib.optional stdenv.isLinux systemd; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { (mkWith true "systemdsystemunitdir" "\${out}/etc/systemd/system") (mkEnable true "largefile" null) (mkEnable true "regexp" null) - (mkEnable (libkrb5 != null) "gssapi-krb5" null) + (mkEnable (krb5 != null) "gssapi-krb5" null) (mkEnable true "klog" null) (mkEnable true "kmsg" null) (mkEnable (systemd != null) "imjournal" null) |