From 97f925962dff7028c473fc7cdf9016b6e54d24ca Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 13 Sep 2025 15:12:12 +0200 Subject: [PATCH] nixosTests.activation-lib: don't use fileset --- .../system/activation/{lib/test.nix => lib-test.nix} | 8 +------- nixos/tests/all-tests.nix | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) rename nixos/modules/system/activation/{lib/test.nix => lib-test.nix} (80%) diff --git a/nixos/modules/system/activation/lib/test.nix b/nixos/modules/system/activation/lib-test.nix similarity index 80% rename from nixos/modules/system/activation/lib/test.nix rename to nixos/modules/system/activation/lib-test.nix index 34d55e0bbe62..72039a6921a0 100644 --- a/nixos/modules/system/activation/lib/test.nix +++ b/nixos/modules/system/activation/lib-test.nix @@ -10,13 +10,7 @@ let runTests = stdenv.mkDerivation { name = "tests-activation-lib"; - src = fileset.toSource { - root = ./.; - fileset = fileset.unions [ - ./lib.sh - ./test.sh - ]; - }; + src = ./lib; buildPhase = ":"; doCheck = true; postUnpack = '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3da2a4c24dc4..59e208317798 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -200,7 +200,7 @@ in activation-bashless-image = runTest ./activation/bashless-image.nix; activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix; activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix; - activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { }; + activation-lib = pkgs.callPackage ../modules/system/activation/lib-test.nix { }; activation-nix-channel = runTest ./activation/nix-channel.nix; activation-nixos-init = runTest ./activation/nixos-init.nix; activation-perlless = runTest ./activation/perlless.nix;