summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2019-05-25 09:49:06 +0200
committerAndreas Rammhold <andreas@rammhold.de>2019-06-03 15:05:24 +0200
commit7508490770ba490ad767d230241822129da70672 (patch)
tree0139a367c6489d92109140789563dc6533f3a660 /nixos
parent9077623324d9366041bb6628be1a5cffb7bc815d (diff)
downloadnixpkgs-7508490770ba490ad767d230241822129da70672.tar
nixpkgs-7508490770ba490ad767d230241822129da70672.tar.gz
nixpkgs-7508490770ba490ad767d230241822129da70672.tar.bz2
nixpkgs-7508490770ba490ad767d230241822129da70672.tar.lz
nixpkgs-7508490770ba490ad767d230241822129da70672.tar.xz
nixpkgs-7508490770ba490ad767d230241822129da70672.tar.zst
nixpkgs-7508490770ba490ad767d230241822129da70672.zip
nixos/test: remove the stateVersion statement from the test-instrumentation
We set stateVersion to `mkDefault 18.03` in
`nixos/modules/testing/test-instrumentation.nix` and in
`modules/installer/cd-dvd/installation-cd-base.nix`.

Accessing the stateVersion in the module system from within the tests
results in the following error:
> The unique option `system.stateVersion' is defined multiple times, in
> `nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix' and
> `nixpkgs/nixos/modules/testing/test-instrumentation.nix'.

There are other tests that use it as well. Namely the radicale test also
verifies behaviour between state versions is as expected. It switches a
package default value. Others switched on the state directory default.
It seems like having the timesyncd switch as part of every rendered
activationScript might cause this weird error.

Removing this line seems like a reasonable thing to do since we actually
set the default to the very same value in the module system. This line
should have been no-op besides the issue that we've two statements
setting it in this very specific case.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/testing/test-instrumentation.nix3
1 files changed, 0 insertions, 3 deletions
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index ed4cfa7805e..1a11d9ce7c2 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -129,9 +129,6 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
     users.users.root.initialHashedPassword = mkOverride 150 "";
 
     services.xserver.displayManager.job.logToJournal = true;
-
-    # set default stateVersion to avoid warnings during eval
-    system.stateVersion = mkDefault "18.03";
   };
 
 }