public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests: prevent stateVersion warnings in eval

Browse Source 
... introduced by 1f0b6922d3c
continuation of 88fa50c2f2bbc472fe7169eac8f2a1b2312ef03b
This commit is contained in:
Uli Baum 2018-05-15 00:18:49 +02:00
parent 4e7d08cd97
commit dd73ab0092
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -31,4 +31,6 @@ with lib;
# Allow the user to log in as root without a password. # Allow the user to log in as root without a password.
users.extraUsers.root.initialHashedPassword = ""; users.extraUsers.root.initialHashedPassword = "";
system.nixos.stateVersion = mkDefault "18.03";
} }

1
nixos/modules/installer/virtualbox-demo.nix
View File

@ -21,4 +21,5 @@ with lib;
services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ]; services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ];
powerManagement.enable = false; powerManagement.enable = false;
system.nixos.stateVersion = mkDefault "18.03";
} }

1
nixos/release.nix
View File

@ -198,6 +198,7 @@ in rec {
modules = singleton ({ config, pkgs, ... }: modules = singleton ({ config, pkgs, ... }:
{ fileSystems."/".device = mkDefault "/dev/sda1"; { fileSystems."/".device = mkDefault "/dev/sda1";
boot.loader.grub.device = mkDefault "/dev/sda"; boot.loader.grub.device = mkDefault "/dev/sda";
system.nixos.stateVersion = mkDefault "18.03";
}); });
}).config.system.build.toplevel; }).config.system.build.toplevel;
preferLocalBuild = true; preferLocalBuild = true;

4
nixos/tests/containers-imperative.nix
View File

@ -17,7 +17,9 @@ import ./make-test.nix ({ pkgs, ...} : {
emptyContainer = import ../lib/eval-config.nix { emptyContainer = import ../lib/eval-config.nix {
inherit (config.nixpkgs.localSystem) system; inherit (config.nixpkgs.localSystem) system;
modules = lib.singleton { modules = lib.singleton {
containers.foo.config = {}; containers.foo.config = {
system.nixos.stateVersion = "18.03";
};
}; };
}; };
in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ]; in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ];

1
nixos/tests/containers-ipv4.nix
View File

@ -21,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.httpd.adminAddr = "foo@example.org"; services.httpd.adminAddr = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowedTCPPorts = [ 80 ];
networking.firewall.allowPing = true; networking.firewall.allowPing = true;
system.nixos.stateVersion = "18.03";
}; };
}; };