From 22eb959f37d4dc44f354f262769f40f793f91fce Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 5 Jan 2023 13:07:12 +0100 Subject: nixos/amazon-option: Tolerate harmless ec2.hvm for compatibility Throwing an error necessitates changes in NixOps that are not safe yet. --- nixos/modules/virtualisation/amazon-options.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 915bbf9763db..926fe43b0ffe 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -2,9 +2,6 @@ let inherit (lib) literalExpression types; in { - imports = [ - (lib.mkRemovedOptionModule [ "ec2" "hvm" ] "Only HVM instances are supported, so specifying it is no longer necessary.") - ]; options = { ec2 = { zfs = { @@ -52,6 +49,12 @@ in { Whether the EC2 instance is using EFI. ''; }; + hvm = lib.mkOption { + description = "Unused legacy option. While support for non-hvm has been dropped, we keep this option around so that NixOps remains compatible with a somewhat recent `nixpkgs` and machines with an old `stateVersion`."; + internal = true; + default = true; + readOnly = true; + }; }; }; -- cgit v1.2.3