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

2022-12-27 21:39:02 +02:00
parent 91b47e1619 3ff04d2fc2
commit 4984fe2fb6
1 changed files with 5 additions and 4 deletions
@@ -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;
        }
      );
  };