diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d1f4d347b32..100a299b2ba8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -841,23 +841,23 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/5.x.nix { }) - filebeat - heartbeat - metricbeat - packetbeat; - - inherit (let beats6 = callPackages ../misc/logging/beats/6.x.nix { }; in { - filebeat6 = beats6.filebeat; - heartbeat6 = beats6.heartbeat; - metricbeat6 = beats6.metricbeat; - packetbeat6 = beats6.packetbeat; - }) + inherit (callPackages ../misc/logging/beats/6.x.nix { }) filebeat6 heartbeat6 metricbeat6 packetbeat6; + filebeat = filebeat6; + heartbeat = heartbeat6; + metricbeat = metricbeat6; + packetbeat = packetbeat6; + + inherit (callPackages ../misc/logging/beats/5.x.nix { }) + filebeat5 + heartbeat5 + metricbeat5 + packetbeat5; + bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; |