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

Fix eval error due to config.ec2.hvm

Browse Source
This commit is contained in:
Eelco Dolstra 2017-04-04 13:07:15 +02:00
parent 279565c3d6
commit 35dbcbb296
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/virtualisation/amazon-image.nix
View File

@ -15,6 +15,12 @@ let cfg = config.ec2; in
config = {
assertions = [
{ assertion = cfg.hvm;
message = "Paravirtualized EC2 instances are no longer supported.";
}
];
virtualisation.growPartition = cfg.hvm;
fileSystems."/" = {

10
nixos/modules/virtualisation/amazon-options.nix
View File

@ -3,7 +3,7 @@
options = {
ec2 = {
hvm = lib.mkOption {
default = false;
default = lib.versionAtLeast config.system.stateVersion "17.03";
internal = true;
description = ''
Whether the EC2 instance is a HVM instance.
@ -11,12 +11,4 @@
};
};
};
config = {
assertions = [
{ assertion = config.ec2.hvm;
message = "Paravirtualized EC2 instances are no longer supported.";
}
];
};
}