diff options
| author | github-actions[bot] | 2024-04-13 00:02:05 +0000 |
|---|---|---|
| committer | GitHub | 2024-04-13 00:02:05 +0000 |
| commit | 5a301eda678bb41e7c0a6ed5cd1056be5030f4e0 (patch) | |
| tree | 5b00aa24e5c1299c50573c8ddc354044040fe4ee /nixos/tests/all-tests.nix | |
| parent | d6a31576e124f4c2d7e8c525d61d0802c6f83550 (diff) | |
| parent | cfd6b5fc90b15709b780a5a1619695a88505a176 (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos/tests/all-tests.nix')
| -rw-r--r-- | nixos/tests/all-tests.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 909eea38b35e..8961bbc075c9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -593,8 +593,8 @@ in { nimdow = handleTest ./nimdow.nix {}; neo4j = handleTest ./neo4j.nix {}; netdata = handleTest ./netdata.nix {}; - networking.networkd = handleTest ./networking.nix { networkd = true; }; - networking.scripted = handleTest ./networking.nix { networkd = false; }; + networking.scripted = handleTest ./networking/networkd-and-scripted.nix { networkd = false; }; + networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; }; netbox_3_6 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_6; }; netbox_3_7 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_7; }; netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix {}; |