nixosTests: fix some eval errors and warnings (#401553)

This commit is contained in:
Robert Hensing
2026-01-20 14:37:41 +00:00
committed by GitHub
6 changed files with 14 additions and 13 deletions
@@ -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 = ''
+8 -2
View File
@@ -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
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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, ... }:
+1 -1
View File
@@ -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, ... }:
+2 -1
View File
@@ -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";
}