public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

journalbeat: make journalbeat6 the default

Browse Source 
Version 6.x is also the default for the other beats.
This commit is contained in:
Bas van Dijk 2019-05-10 15:39:11 +02:00
parent 42c9c6df73
commit a662f99139
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/top-level/all-packages.nix
View File

@ -976,6 +976,8 @@ in
metricbeat5 metricbeat5
packetbeat5; packetbeat5;
journalbeat5 = callPackage ../tools/system/journalbeat { };
inherit (callPackages ../misc/logging/beats/6.x.nix { inherit (callPackages ../misc/logging/beats/6.x.nix {
# XXX: this is failing with Go 1.12. Error is related to cgo, an # XXX: this is failing with Go 1.12. Error is related to cgo, an
# update to this package might fix it. # update to this package might fix it.
@ -1002,6 +1004,7 @@ in
heartbeat = heartbeat6; heartbeat = heartbeat6;
metricbeat = metricbeat6; metricbeat = metricbeat6;
packetbeat = packetbeat6; packetbeat = packetbeat6;
journalbeat = journalbeat6;
bfr = callPackage ../tools/misc/bfr { }; bfr = callPackage ../tools/misc/bfr { };
@ -3787,8 +3790,6 @@ in
joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; joplin-desktop = callPackage ../applications/misc/joplin-desktop { };
journalbeat = callPackage ../tools/system/journalbeat { };
journaldriver = callPackage ../tools/misc/journaldriver { }; journaldriver = callPackage ../tools/misc/journaldriver { };
jp = callPackage ../development/tools/jp { }; jp = callPackage ../development/tools/jp { };