fix system.stateVersion

checks/lib/test-base.nix

@@ -7,14 +7,17 @@ in
 (nixos-lib.runTest {
   hostPkgs = pkgs;
   # speed-up evaluation
-  defaults = {
+  defaults = (
+    { config, ... }:
+    {
       imports = [
         ./minify.nix
       ];
       documentation.enable = lib.mkDefault false;
       nix.settings.min-free = 0;
-    system.stateVersion = lib.version;
+      system.stateVersion = config.system.nixos.release;
-  };
+    }
+  );
 
   # to accept external dependencies such as disko
   node.specialArgs.self = self;

lib/eval-clan-modules/default.nix

@@ -6,11 +6,14 @@
 let
   baseModule = {
     imports = (import (pkgs.path + "/nixos/modules/module-list.nix")) ++ [
+      (
+        { config, ... }:
         {
           nixpkgs.pkgs = pkgs;
           clan.core.name = "dummy";
-        system.stateVersion = lib.version;
+          system.stateVersion = config.system.nixos.release;
         }
+      )
     ];
   };
 

pkgs/clan-cli/tests/machines/vm1/default.nix

@@ -1,7 +1,7 @@
-{ lib, ... }:
+{ config, ... }:
 {
   clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
-  system.stateVersion = lib.version;
+  system.stateVersion = config.system.nixos.release;
   sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
   clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
   clan.virtualisation.graphics = false;

pkgs/clan-cli/tests/machines/vm_with_secrets/default.nix

@@ -1,7 +1,7 @@
-{ lib, ... }:
+{ config, ... }:
 {
   clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
-  system.stateVersion = lib.version;
+  system.stateVersion = config.system.nixos.release;
   sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
   clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
   clan.virtualisation.graphics = false;

pkgs/clan-cli/tests/machines/vm_without_secrets/default.nix

@@ -1,7 +1,7 @@
-{ lib, ... }:
+{ config, ... }:
 {
   clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
-  system.stateVersion = lib.version;
+  system.stateVersion = config.system.nixos.release;
   clan.virtualisation.graphics = false;
 
   networking.useDHCP = false;

pkgs/clan-cli/tests/test_flake_with_core/flake.nix

@@ -14,11 +14,11 @@
         meta.name = "test_flake_with_core";
         machines = {
           vm1 =
-            { lib, ... }:
+            { config, ... }:
             {
               nixpkgs.hostPlatform = "x86_64-linux";
               clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
-              system.stateVersion = lib.version;
+              system.stateVersion = config.system.nixos.release;
               sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
               clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
               clan.core.sops.defaultGroups = [ "admins" ];
@@ -28,7 +28,7 @@
               networking.useDHCP = false;
             };
           vm2 =
-            { lib, ... }:
+            { config, ... }:
             {
               nixpkgs.hostPlatform = "x86_64-linux";
               imports = [
@@ -39,7 +39,7 @@
               clan.user-password.user = "alice";
               clan.user-password.prompt = false;
               clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
-              system.stateVersion = lib.version;
+              system.stateVersion = config.system.nixos.release;
               sops.age.keyFile = "__CLAN_SOPS_KEY_PATH__";
               clan.core.facts.secretUploadDirectory = "__CLAN_SOPS_KEY_DIR__";
               clan.core.networking.zerotier.networkId = "82b44b162ec6c013";

pkgs/clan-cli/tests/test_flake_with_core_and_pass/flake.nix

@@ -13,7 +13,7 @@
         meta.name = "test_flake_with_core_and_pass";
         machines = {
           vm1 =
-            { lib, ... }:
+            { lib, config, ... }:
             {
               imports = [
                 clan-core.clanModules.sshd
@@ -24,7 +24,7 @@
               clan.user-password.prompt = false;
 
               clan.core.networking.targetHost = "__CLAN_TARGET_ADDRESS__";
-              system.stateVersion = lib.version;
+              system.stateVersion = config.system.nixos.release;
               clan.core.facts.secretStore = "password-store";
               clan.core.facts.secretUploadDirectory = lib.mkForce "__CLAN_SOPS_KEY_DIR__/secrets";
 

pkgs/installer/flake-module.nix

@@ -15,7 +15,7 @@ let
         self.clanModules.trusted-nix-caches
       ];
 
-      system.stateVersion = config.system.nixos.version;
+      system.stateVersion = config.system.nixos.release;
       nixpkgs.pkgs = self.inputs.nixpkgs.legacyPackages.x86_64-linux;
 
       boot.loader.grub.efiSupport = lib.mkDefault true;

templates/clan/machineTemplates/machines/flash-installer/configuration.nix

@@ -14,5 +14,5 @@
   ];
 
   nixpkgs.pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
-  system.stateVersion = config.system.nixos.version;
+  system.stateVersion = config.system.nixos.release;
 }

templates/flake-module.nix

@@ -11,9 +11,9 @@
 
           # TODO: Instead create a machine by calling the API, this wont break in future tests and is much closer to what the user performs
           cat > $out/machines/testmachine/hardware-configuration.nix << EOF
-          { lib, ... }: {
+          { lib, config, ... }: {
             nixpkgs.hostPlatform = "x86_64-linux";
-            system.stateVersion = lib.version;
+            system.stateVersion = config.system.nixos.release;
             documentation.enable = false;
             users.users.root.initialPassword = "fnord23";
             boot.loader.grub.devices = lib.mkForce [ "/dev/sda" ];