From 4ddce6e9266d5761dd7d423acf24a40d6759fe5b Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Sun, 10 Dec 2023 17:12:57 +0000 Subject: [PATCH] fix the tests we broke --- modules/all-modules.nix | 8 ++++---- tests/jffs2/configuration.nix | 2 +- tests/min-copy-closure/configuration.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/all-modules.nix b/modules/all-modules.nix index a4fe59d..1e7f58d 100644 --- a/modules/all-modules.nix +++ b/modules/all-modules.nix @@ -9,15 +9,15 @@ ./busybox.nix ./dhcp6c ./dnsmasq - ./ext4fs.nix + ./outputs/ext4fs.nix ./firewall ./hardware.nix ./hostapd ./hostname.nix - ./initramfs.nix - ./jffs2.nix + ./outputs/initramfs.nix + ./outputs/jffs2.nix ./kernel.nix - ./kexecboot.nix + ./outputs/kexecboot.nix ./mount ./network ./ntp diff --git a/tests/jffs2/configuration.nix b/tests/jffs2/configuration.nix index 608822d..2515fbf 100644 --- a/tests/jffs2/configuration.nix +++ b/tests/jffs2/configuration.nix @@ -5,7 +5,7 @@ in { imports = [ ../../vanilla-configuration.nix ../../modules/squashfs.nix - ../../modules/jffs2.nix + ../../modules/outputs/jffs2.nix ]; config.rootfsType = "jffs2"; config.filesystem = dir { diff --git a/tests/min-copy-closure/configuration.nix b/tests/min-copy-closure/configuration.nix index 1801c99..9dfe0d4 100644 --- a/tests/min-copy-closure/configuration.nix +++ b/tests/min-copy-closure/configuration.nix @@ -13,7 +13,7 @@ let in { imports = [ ../../vanilla-configuration.nix - ../../modules/jffs2.nix + ../../modules/outputs/jffs2.nix ]; config = { services.sshd = longrun {