diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-04-04 13:07:15 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-04-04 13:49:13 +0200 |
| commit | 35dbcbb2960cd5a310638183cf75a7874c57e373 (patch) | |
| tree | 4846b0d11d9cea29d22b77f5d47794dfa71163af | |
| parent | 279565c3d623e16aff3233c7489d22d655adf773 (diff) | |
| download | nixpkgs-35dbcbb2960cd5a310638183cf75a7874c57e373.tar nixpkgs-35dbcbb2960cd5a310638183cf75a7874c57e373.tar.gz nixpkgs-35dbcbb2960cd5a310638183cf75a7874c57e373.tar.bz2 nixpkgs-35dbcbb2960cd5a310638183cf75a7874c57e373.tar.lz nixpkgs-35dbcbb2960cd5a310638183cf75a7874c57e373.tar.xz nixpkgs-35dbcbb2960cd5a310638183cf75a7874c57e373.tar.zst nixpkgs-35dbcbb2960cd5a310638183cf75a7874c57e373.zip | |
Fix eval error due to config.ec2.hvm
| -rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/amazon-options.nix | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 80e481d79b9..3e47710361a 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -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."/" = { diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index cba77d3edd1..349fd3adfc9 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -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."; - } - ]; - }; } |