diff options
author | K900 <me@0upti.me> | 2023-02-18 00:10:07 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-18 00:10:07 +0300 |
commit | 9f987b895db3172136b78fff8f410008f37185df (patch) | |
tree | 635b41af2cabc9cf493b12b1bf62e1d9970b4ae7 /nixos/tests | |
parent | 9d344df50a6130917791e851ecb75ba5c6a5112d (diff) | |
parent | 254426ec4bce7d289c80d7e84feb616d756efdd7 (diff) |
Merge pull request #216658 from K900/sensible-test-timeouts
nixos/tests: sensible test timeouts
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/pass-secret-service.nix | 2 | ||||
-rw-r--r-- | nixos/tests/quake3.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixos/tests/pass-secret-service.nix b/nixos/tests/pass-secret-service.nix index a85a508bfe16b..e0dddf0ad29e2 100644 --- a/nixos/tests/pass-secret-service.nix +++ b/nixos/tests/pass-secret-service.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "pass-secret-service"; - meta.maintainers = with lib; [ aidalgol ]; + meta.maintainers = [ lib.maintainers.aidalgol ]; nodes.machine = { nodes, pkgs, ... }: { diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 82af1af463d03..ef5fcc41476bc 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ...} : +import ./make-test-python.nix ({ pkgs, lib, ...} : let @@ -11,9 +11,9 @@ let }; # Only allow the demo data to be used (only if it's unfreeRedistributable). - unfreePredicate = pkg: with pkgs.lib; let + unfreePredicate = pkg: with lib; let allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ]; - allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ]; + allowLicenses = [ lib.licenses.unfreeRedistributable ]; in elem pkg.pname allowPackageNames && elem (pkg.meta.license or null) allowLicenses; @@ -31,7 +31,7 @@ in rec { name = "quake3"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with lib.maintainers; { maintainers = [ domenkozar eelco ]; }; |