diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-05-10 15:39:11 +0200 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-05-10 15:39:11 +0200 |
| commit | a662f991392effcc5679d391ca5fcc373f225a2e (patch) | |
| tree | 9673d400cbbe7d520aabd50bc20d44efd3908706 | |
| parent | 42c9c6df73a1813fd485a5ec731b621ed8371989 (diff) | |
| download | nixpkgs-a662f991392effcc5679d391ca5fcc373f225a2e.tar nixpkgs-a662f991392effcc5679d391ca5fcc373f225a2e.tar.gz nixpkgs-a662f991392effcc5679d391ca5fcc373f225a2e.tar.bz2 nixpkgs-a662f991392effcc5679d391ca5fcc373f225a2e.tar.lz nixpkgs-a662f991392effcc5679d391ca5fcc373f225a2e.tar.xz nixpkgs-a662f991392effcc5679d391ca5fcc373f225a2e.tar.zst nixpkgs-a662f991392effcc5679d391ca5fcc373f225a2e.zip | |
journalbeat: make journalbeat6 the default
Version 6.x is also the default for the other beats.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files 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 { }; |