nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-14 04:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #144604 from hercules-ci/logstash-fix-passthru-tests-unfree

Browse Source
This commit is contained in:
Artturi 2022-12-27 21:39:02 +02:00 committed by GitHub
commit 4984fe2fb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/logstash/7.x.nix
View File

@ -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;
}
);
};