From ffc9c1bd487aaa41cea68ae6114542e546148a7b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 24 Apr 2025 22:25:47 +0200 Subject: [PATCH 1/5] nixosTests.activation.test-forbiddenDependencies-{fail,succeed}: set stateVersion --- nixos/modules/system/activation/test.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/test.nix b/nixos/modules/system/activation/test.nix index fe8acb708868..ca399e5aeb4a 100644 --- a/nixos/modules/system/activation/test.nix +++ b/nixos/modules/system/activation/test.nix @@ -6,7 +6,7 @@ }: let node-forbiddenDependencies-fail = nixos ( - { ... }: + { config, ... }: { system.forbiddenDependenciesRegexes = [ "-dev$" ]; environment.etc."dev-dependency" = { @@ -15,16 +15,22 @@ let documentation.enable = false; fileSystems."/".device = "ignore-root-device"; boot.loader.grub.enable = false; + + # Don't do this in an actual config + system.stateVersion = config.system.nixos.release; } ); node-forbiddenDependencies-succeed = nixos ( - { ... }: + { config, ... }: { system.forbiddenDependenciesRegexes = [ "-dev$" ]; system.extraDependencies = [ expect.dev ]; documentation.enable = false; fileSystems."/".device = "ignore-root-device"; boot.loader.grub.enable = false; + + # Don't do this in an actual config + system.stateVersion = config.system.nixos.release; } ); in From 0e2009336725af6c2e280496a98cc740b39244d9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 24 Apr 2025 22:27:13 +0200 Subject: [PATCH 2/5] nixosTests.vm-variant: set system and don't use pkgs.system --- nixos/tests/vm-variant.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/vm-variant.nix b/nixos/tests/vm-variant.nix index cc95a3e6ed69..cfd8ef50a46c 100644 --- a/nixos/tests/vm-variant.nix +++ b/nixos/tests/vm-variant.nix @@ -6,12 +6,13 @@ let evalConfig = import ../lib/eval-config.nix; nixos = evalConfig { + system = null; modules = [ { system.stateVersion = "25.05"; fileSystems."/".device = "/dev/null"; boot.loader.grub.device = "nodev"; - nixpkgs.hostPlatform = pkgs.system; + nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform.system; virtualisation.vmVariant.networking.hostName = "vm"; virtualisation.vmVariantWithBootLoader.networking.hostName = "vm-w-bl"; } From 97f925962dff7028c473fc7cdf9016b6e54d24ca Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 13 Sep 2025 15:12:12 +0200 Subject: [PATCH 3/5] 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; From 12361457cb1c4171d999c3fba4f1176e485dbcb0 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 9 Oct 2025 21:52:58 +0200 Subject: [PATCH 4/5] nixosTests.kanidm: use non deprecated package --- nixos/tests/kanidm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index c9fd7bb2a083..dcbabe93cb71 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -21,7 +21,7 @@ in oddlama ]; - _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm; + _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm_1_7; nodes.server = { pkgs, ... }: From 64478451623c5df21c368801de8071d4984c5a01 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 9 Oct 2025 22:09:00 +0200 Subject: [PATCH 5/5] nixosTests.kanidm-provisioning: don't use aliase --- nixos/tests/kanidm-provisioning.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix index 1e6b39be7eba..1c6c6845a74d 100644 --- a/nixos/tests/kanidm-provisioning.nix +++ b/nixos/tests/kanidm-provisioning.nix @@ -18,7 +18,7 @@ in name = "kanidm-provisioning-${kanidmPackage.version}"; meta.maintainers = with pkgs.lib.maintainers; [ oddlama ]; - _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning; + _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning_1_7; nodes.provision = { pkgs, lib, ... }: