From 824fccd3e90cf75d5e2968fef2392f70e04d9f9c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 16 Feb 2015 09:56:08 +0000
Subject: [PATCH] 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)
---
 nixos/modules/module-list.nix                   |  2 +-
 nixos/modules/virtualisation/amazon-image.nix   | 11 -----------
 nixos/modules/virtualisation/amazon-options.nix | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 nixos/modules/virtualisation/amazon-options.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0fad59d5571..8ce1c6c20a3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -426,7 +426,7 @@
   ./virtualisation/docker.nix
   ./virtualisation/libvirtd.nix
   ./virtualisation/lxc.nix
-  #./virtualisation/nova.nix
+  ./virtualisation/amazon-options.nix
   ./virtualisation/openvswitch.nix
   ./virtualisation/parallels-guest.nix
   ./virtualisation/virtualbox-guest.nix
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 (
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
new file mode 100644
index 00000000000..34a50dcab16
--- /dev/null
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+{
+  options = {
+    ec2 = {
+      hvm = lib.mkOption {
+        default = false;
+        internal = true;
+        description = ''
+          Whether the EC2 instance is a HVM instance.
+        '';
+      };
+    };
+  };
+
+  config = {};
+}