diff options
| author | Artturi <Artturin@artturin.com> | 2022-12-27 21:39:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-27 21:39:02 +0200 |
| commit | 4984fe2fb6757bd0155cb4a41dcacc6f9b13cde6 (patch) | |
| tree | 1b21ec84c8437d49b9a5904a8833f3a7f6c787ea /pkgs/tools/misc/logstash | |
| parent | 91b47e1619f2d7dbffdd54774e175f6f90338743 (diff) | |
| parent | 3ff04d2fc26b8d487a02843a804b8ee8995f6521 (diff) | |
Merge pull request #144604 from hercules-ci/logstash-fix-passthru-tests-unfree
Diffstat (limited to 'pkgs/tools/misc/logstash')
| -rw-r--r-- | pkgs/tools/misc/logstash/7.x.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 2dabcee2a0529..221c7be83dff2 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -1,4 +1,5 @@ -{ elk7Version +{ config +, elk7Version , enableUnfree ? true , lib , stdenv @@ -78,10 +79,10 @@ let maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; passthru.tests = - optionalAttrs (!enableUnfree) ( - assert this.drvPath == nixosTests.elk.ELK-7.elkPackages.logstash.drvPath; + optionalAttrs (config.allowUnfree && enableUnfree) ( + assert this.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.logstash.drvPath; { - elk = nixosTests.elk.ELK-7; + elk = nixosTests.elk.unfree.ELK-7; } ); }; |