summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2019-09-29 21:21:21 -0500
committerMario Rodas <marsam@users.noreply.github.com>2019-09-29 21:21:21 -0500
commit0449518afbf2f34c8ae40c15713edfcef4536179 (patch)
tree6452a5da3af85aa33db4a5c0d929fdf7381614c0 /pkgs/top-level
parent50675916d11a7f2155acb05151c78d5f06f6bb6f (diff)
downloadnixpkgs-0449518afbf2f34c8ae40c15713edfcef4536179.tar
nixpkgs-0449518afbf2f34c8ae40c15713edfcef4536179.tar.gz
nixpkgs-0449518afbf2f34c8ae40c15713edfcef4536179.tar.bz2
nixpkgs-0449518afbf2f34c8ae40c15713edfcef4536179.tar.lz
nixpkgs-0449518afbf2f34c8ae40c15713edfcef4536179.tar.xz
nixpkgs-0449518afbf2f34c8ae40c15713edfcef4536179.tar.zst
nixpkgs-0449518afbf2f34c8ae40c15713edfcef4536179.zip
zeek: 2.5.5 -> 3.0.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix6
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7c6cdb8b1a3..a6b4c2db0f8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f63b316752f..0ea8a48229f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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