diff options
| author | Uli Baum <xeji@cat3.de> | 2018-05-15 00:18:49 +0200 |
|---|---|---|
| committer | Uli Baum <xeji@cat3.de> | 2018-05-15 00:22:35 +0200 |
| commit | dd73ab00923a4b39fe7b3fbce31cadfd38d8177b (patch) | |
| tree | 1632c4a7d3a83e214a9ad1c1bd471df2cc1a0aee /nixos | |
| parent | 4e7d08cd97bb93daf60ebe4a6716b248324adca8 (diff) | |
| download | nixlib-dd73ab00923a4b39fe7b3fbce31cadfd38d8177b.tar nixlib-dd73ab00923a4b39fe7b3fbce31cadfd38d8177b.tar.gz nixlib-dd73ab00923a4b39fe7b3fbce31cadfd38d8177b.tar.bz2 nixlib-dd73ab00923a4b39fe7b3fbce31cadfd38d8177b.tar.lz nixlib-dd73ab00923a4b39fe7b3fbce31cadfd38d8177b.tar.xz nixlib-dd73ab00923a4b39fe7b3fbce31cadfd38d8177b.tar.zst nixlib-dd73ab00923a4b39fe7b3fbce31cadfd38d8177b.zip | |
nixos/tests: prevent stateVersion warnings in eval
... introduced by 1f0b6922d3c continuation of 88fa50c2f2bbc472fe7169eac8f2a1b2312ef03b
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/virtualbox-demo.nix | 1 | ||||
| -rw-r--r-- | nixos/release.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/containers-imperative.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/containers-ipv4.nix | 1 |
5 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 756c8751d00e..1ed56386e6e7 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -31,4 +31,6 @@ with lib; # Allow the user to log in as root without a password. users.extraUsers.root.initialHashedPassword = ""; + + system.nixos.stateVersion = mkDefault "18.03"; } diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 13a0d7f4f6ee..c40e30354206 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -21,4 +21,5 @@ with lib; services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ]; powerManagement.enable = false; + system.nixos.stateVersion = mkDefault "18.03"; } diff --git a/nixos/release.nix b/nixos/release.nix index 57fc245e57dd..7ec41af4fd4b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -198,6 +198,7 @@ in rec { modules = singleton ({ config, pkgs, ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; + system.nixos.stateVersion = mkDefault "18.03"; }); }).config.system.build.toplevel; preferLocalBuild = true; diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 015b79b1cee6..a548b17b1ff1 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -17,7 +17,9 @@ import ./make-test.nix ({ pkgs, ...} : { emptyContainer = import ../lib/eval-config.nix { inherit (config.nixpkgs.localSystem) system; modules = lib.singleton { - containers.foo.config = {}; + containers.foo.config = { + system.nixos.stateVersion = "18.03"; + }; }; }; in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ]; diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix index 31d05990a679..821ce1cd07d2 100644 --- a/nixos/tests/containers-ipv4.nix +++ b/nixos/tests/containers-ipv4.nix @@ -21,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowPing = true; + system.nixos.stateVersion = "18.03"; }; }; |