summary refs log tree commit diff
path: root/nixos/lib/build-vms.nix
diff options
context:
space:
mode:
authorDavid Arnold <dgx.arnold@gmail.com>2021-06-20 23:29:26 -0500
committer"David Arnold" <dgx.arnold@gmail.com>2021-06-21 11:08:26 -0500
commit8bbdff45816c657f679cd77c0a0dbca534a85bf3 (patch)
tree837b3405aa363fcfbec07efbd12843d4b3546b60 /nixos/lib/build-vms.nix
parentec97be764a2ad45b6501a1c63c9a558451ba5f1f (diff)
downloadnixpkgs-8bbdff45816c657f679cd77c0a0dbca534a85bf3.tar
nixpkgs-8bbdff45816c657f679cd77c0a0dbca534a85bf3.tar.gz
nixpkgs-8bbdff45816c657f679cd77c0a0dbca534a85bf3.tar.bz2
nixpkgs-8bbdff45816c657f679cd77c0a0dbca534a85bf3.tar.lz
nixpkgs-8bbdff45816c657f679cd77c0a0dbca534a85bf3.tar.xz
nixpkgs-8bbdff45816c657f679cd77c0a0dbca534a85bf3.tar.zst
nixpkgs-8bbdff45816c657f679cd77c0a0dbca534a85bf3.zip
nixosTest: Force system.nixos.revision constant
nixos tests are blended with other system configurations, hence
their settings must be either enforced or defaulted.

This particular setting is set via lib.nixosSystem as
`system.nixos.revision = final.mkIf (self ? rev) self.rev;` which would
mean that without this change no flake generated nixos could be blended
with nixos testing.

This setting was made previously constant in 
169c6b4b1478a3a0c823c99ea39d4082f76a2708 in order to avoid pointless
rebuilds of the testing VMs, but was set without enforcing it.
Diffstat (limited to 'nixos/lib/build-vms.nix')
-rw-r--r--nixos/lib/build-vms.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 064e44f643b..f0a58628c68 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -41,7 +41,7 @@ rec {
             # The human version (e.g. 21.05-pre) is left as is, because it is useful
             # for external modules that test with e.g. nixosTest and rely on that
             # version number.
-            config.system.nixos.revision = "constant-nixos-revision";
+            config.system.nixos.revision = mkForce "constant-nixos-revision";
           }
           { key = "nodes"; _module.args.nodes = nodes; }
         ] ++ optional minimal ../modules/testing/minimal-kernel.nix;