diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2015-02-16 09:56:08 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2015-02-16 09:57:19 +0000 |
| commit | 824fccd3e90cf75d5e2968fef2392f70e04d9f9c (patch) | |
| tree | c2c58ca618d163aab0e6640ce5fef6dae04c1f6d /nixos/modules/virtualisation/amazon-image.nix | |
| parent | 85e2076a0b201daeca3a34169076a88c59dc8e91 (diff) | |
| download | nixpkgs-824fccd3e90cf75d5e2968fef2392f70e04d9f9c.tar nixpkgs-824fccd3e90cf75d5e2968fef2392f70e04d9f9c.tar.gz nixpkgs-824fccd3e90cf75d5e2968fef2392f70e04d9f9c.tar.bz2 nixpkgs-824fccd3e90cf75d5e2968fef2392f70e04d9f9c.tar.lz nixpkgs-824fccd3e90cf75d5e2968fef2392f70e04d9f9c.tar.xz nixpkgs-824fccd3e90cf75d5e2968fef2392f70e04d9f9c.tar.zst nixpkgs-824fccd3e90cf75d5e2968fef2392f70e04d9f9c.zip | |
Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable from nixops, without breaking evaluation for other backends.
(cherry picked from commit 213fe8427c5ce455b893c0c5c56cc38175bf36b7)
Diffstat (limited to 'nixos/modules/virtualisation/amazon-image.nix')
| -rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index d175bac3074..32783279bb2 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -7,17 +7,6 @@ in { imports = [ ../profiles/headless.nix ./ec2-data.nix ]; - options = { - ec2 = { - hvm = mkOption { - default = false; - description = '' - Whether the EC2 instance is a HVM instance. - ''; - }; - }; - }; - config = { system.build.amazonImage = pkgs.vmTools.runInLinuxVM ( |