From a662f991392effcc5679d391ca5fcc373f225a2e Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 10 May 2019 15:39:11 +0200 Subject: journalbeat: make journalbeat6 the default Version 6.x is also the default for the other beats. --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4feeebeb0fd..94add0a2bad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -976,6 +976,8 @@ in metricbeat5 packetbeat5; + journalbeat5 = callPackage ../tools/system/journalbeat { }; + inherit (callPackages ../misc/logging/beats/6.x.nix { # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. @@ -1002,6 +1004,7 @@ in heartbeat = heartbeat6; metricbeat = metricbeat6; packetbeat = packetbeat6; + journalbeat = journalbeat6; bfr = callPackage ../tools/misc/bfr { }; @@ -3787,8 +3790,6 @@ in joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; - journalbeat = callPackage ../tools/system/journalbeat { }; - journaldriver = callPackage ../tools/misc/journaldriver { }; jp = callPackage ../development/tools/jp { }; -- cgit 1.4.1