diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /nixos/modules/virtualisation | |
parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) | |
download | nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.gz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.bz2 nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.lz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.xz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.zst nixlib-30f14243c33f1b386273d08a4776aa679c42143d.zip |
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/ec2-amis.nix | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 15ea7bb19448..e0aad5e42f20 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -89,4 +89,41 @@ "15.09".us-west-2.hvm-s3 = "ami-2956b849"; "15.09".us-west-2.pv-ebs = "ami-005fb160"; "15.09".us-west-2.pv-s3 = "ami-cd55bbad"; + + "16.03".ap-northeast-1.hvm-ebs = "ami-885040e6"; + "16.03".ap-northeast-1.hvm-s3 = "ami-d15a4abf"; + "16.03".ap-northeast-1.pv-ebs = "ami-7f455511"; + "16.03".ap-northeast-1.pv-s3 = "ami-6d7d6d03"; + "16.03".ap-southeast-1.hvm-ebs = "ami-478a5f24"; + "16.03".ap-southeast-1.hvm-s3 = "ami-b2885dd1"; + "16.03".ap-southeast-1.pv-ebs = "ami-55b46136"; + "16.03".ap-southeast-1.pv-s3 = "ami-92b762f1"; + "16.03".ap-southeast-2.hvm-ebs = "ami-26b09345"; + "16.03".ap-southeast-2.hvm-s3 = "ami-52ac8f31"; + "16.03".ap-southeast-2.pv-ebs = "ami-1fb3907c"; + "16.03".ap-southeast-2.pv-s3 = "ami-49b1922a"; + "16.03".eu-central-1.hvm-ebs = "ami-2bd63744"; + "16.03".eu-central-1.hvm-s3 = "ami-82d435ed"; + "16.03".eu-central-1.pv-ebs = "ami-b729c8d8"; + "16.03".eu-central-1.pv-s3 = "ami-a12dccce"; + "16.03".eu-west-1.hvm-ebs = "ami-87c242f4"; + "16.03".eu-west-1.hvm-s3 = "ami-b6c343c5"; + "16.03".eu-west-1.pv-ebs = "ami-6bc94918"; + "16.03".eu-west-1.pv-s3 = "ami-00cb4b73"; + "16.03".sa-east-1.hvm-ebs = "ami-845cd3e8"; + "16.03".sa-east-1.hvm-s3 = "ami-8142cded"; + "16.03".sa-east-1.pv-ebs = "ami-1643cc7a"; + "16.03".sa-east-1.pv-s3 = "ami-1646c97a"; + "16.03".us-east-1.hvm-ebs = "ami-2cc4d046"; + "16.03".us-east-1.hvm-s3 = "ami-9bc9ddf1"; + "16.03".us-east-1.pv-ebs = "ami-7df4e017"; + "16.03".us-east-1.pv-s3 = "ami-90f2e6fa"; + "16.03".us-west-1.hvm-ebs = "ami-d8116db8"; + "16.03".us-west-1.hvm-s3 = "ami-a7166ac7"; + "16.03".us-west-1.pv-ebs = "ami-e90c7089"; + "16.03".us-west-1.pv-s3 = "ami-5b0c703b"; + "16.03".us-west-2.hvm-ebs = "ami-b339ccd3"; + "16.03".us-west-2.hvm-s3 = "ami-2c3bce4c"; + "16.03".us-west-2.pv-ebs = "ami-0625d066"; + "16.03".us-west-2.pv-s3 = "ami-7414e114"; } |