Merge pull request #214969 from LeSuisse/metricbeat7-passthru-tests

authored by Artturi and committed by GitHub 1c42e6f6 6ad074f2

+7 -5
+7 -5
pkgs/misc/logging/beats/7.x.nix
··· 1 - { lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd }: 2 3 let beat = package: extraArgs: buildGoModule (rec { 4 pname = package; ··· 36 metricbeat7 = beat "metricbeat" { 37 meta.description = "Lightweight shipper for metrics"; 38 passthru.tests = 39 - assert metricbeat7.drvPath == nixosTests.elk.ELK-7.elkPackages.metricbeat.drvPath; 40 - { 41 - elk = nixosTests.elk.ELK-7; 42 - }; 43 }; 44 packetbeat7 = beat "packetbeat" { 45 buildInputs = [ libpcap ];
··· 1 + { lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd, config }: 2 3 let beat = package: extraArgs: buildGoModule (rec { 4 pname = package; ··· 36 metricbeat7 = beat "metricbeat" { 37 meta.description = "Lightweight shipper for metrics"; 38 passthru.tests = 39 + lib.optionalAttrs config.allowUnfree ( 40 + assert metricbeat7.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.metricbeat.drvPath; 41 + { 42 + elk = nixosTests.elk.unfree.ELK-7; 43 + } 44 + ); 45 }; 46 packetbeat7 = beat "packetbeat" { 47 buildInputs = [ libpcap ];