aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix4
-rw-r--r--nixos/tests/all-tests.nix5
2 files changed, 3 insertions, 6 deletions
diff --git a/flake.nix b/flake.nix
index 4bf73f8..bef6329 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,9 +67,7 @@
legacyPackages = forAllSystems (
{ pkgs, ... }:
{
- nixosTests = pkgs.callPackage ./nixos/tests/all-tests.nix {
- nixos-lib = import (nixpkgs + "/nixos/lib") { };
- };
+ nixosTests = import ./nixos/tests/all-tests.nix pkgs;
}
);
checks = forAllSystems (
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b0373da..68342d6 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1,4 +1,4 @@
-{ nixos-lib, pkgs }:
+pkgs:
let
dsl = ./dsl.nix;
@@ -54,10 +54,9 @@ in
builtins.mapAttrs
(
name: value:
- nixos-lib.runTest (
+ pkgs.testers.runNixOSTest (
{
inherit name;
- hostPkgs = pkgs;
testScript = ''
start_all()
substituter.wait_for_unit("nix-serve.service")