alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable from nixops, without breaking evaluation for other backends.

Browse source
This commit is contained in:
Rob Vermaas 2015-02-16 09:56:08 +00:00
parent 3e6cedab0d
commit 213fe8427c
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/module-list.nix
View file

@ -406,7 +406,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

11
nixos/modules/virtualisation/amazon-image.nix
View file

@ -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 (

16
nixos/modules/virtualisation/amazon-options.nix Normal file
View file

@ -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 = {};
}