Merge pull request #70046 from marsam/update-zeek

zeek: 2.5.5 -> 3.0.0
This commit is contained in:
Mario Rodas
2019-10-02 06:40:15 -05:00
committed by GitHub
4 changed files with 34 additions and 28 deletions

View File

@@ -48,6 +48,7 @@ mapAliases ({
bar-xft = lemonbar-xft; # added 2015-01-16
bashCompletion = bash-completion; # Added 2016-09-28
bridge_utils = bridge-utils; # added 2015-02-20
bro = zeek; # added 2019-09-29
btrfsProgs = btrfs-progs; # added 2016-01-03
bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03

View File

@@ -1198,10 +1198,6 @@ in
brltty = callPackage ../tools/misc/brltty { };
bro = callPackage ../applications/networking/ids/bro {
openssl = openssl_1_0_2;
};
brook = callPackage ../tools/networking/brook { };
broot = callPackage ../tools/misc/broot { };
@@ -2842,6 +2838,8 @@ in
zabbixctl = callPackage ../tools/misc/zabbixctl { };
zeek = callPackage ../applications/networking/ids/zeek { };
zzuf = callPackage ../tools/security/zzuf { };
### DEVELOPMENT / EMSCRIPTEN