Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 392b12f2525d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cda4a36eda36
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 28, 2019

  1. ec2-amis.nix: add 19.09 amis 

    replace /home/deploy -> $HOME to allow running the script from outside
the bastion.
    @AmineChikhaoui
    AmineChikhaoui committed Oct 28, 2019
    Copy the full SHA
    dc13a7f View commit details

Commits on Oct 31, 2019

  1. Merge pull request #72186 from AmineChikhaoui/ec2-19-09-amis 

    ec2-amis.nix: add 19.09 amis
    @grahamc
    grahamc authored Oct 31, 2019
    Copy the full SHA
    cda4a36 View commit details
Showing with 18 additions and 2 deletions.
  1. +1 −1 nixos/maintainers/scripts/ec2/create-amis.sh
  2. +17 −1 nixos/modules/virtualisation/ec2-amis.nix
2 changes: 1 addition & 1 deletion nixos/maintainers/scripts/ec2/create-amis.sh
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
set -euo pipefail

# configuration
state_dir=/home/deploy/amis/ec2-images
state_dir=$HOME/amis/ec2-images
home_region=eu-west-1
bucket=nixos-amis

18 changes: 17 additions & 1 deletion nixos/modules/virtualisation/ec2-amis.nix
View file
Original file line number Diff line number Diff line change
@@ -291,5 +291,21 @@ let self = {
"19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2";
"19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878";

latest = self."19.03";
# 19.09.981.205691b7cbe
"19.09".eu-west-1.hvm-ebs = "ami-0ebd3156e21e9642f";
"19.09".eu-west-2.hvm-ebs = "ami-02a2b5480a79084b7";
"19.09".eu-west-3.hvm-ebs = "ami-09aa175c7588734f7";
"19.09".eu-central-1.hvm-ebs = "ami-00a7fafd7e237a330";
"19.09".us-east-1.hvm-ebs = "ami-00a8eeaf232a74f84";
"19.09".us-east-2.hvm-ebs = "ami-093efd3a57a1e03a8";
"19.09".us-west-1.hvm-ebs = "ami-0913e9a2b677fac30";
"19.09".us-west-2.hvm-ebs = "ami-02d9a19f77b47882a";
"19.09".ca-central-1.hvm-ebs = "ami-0627dd3f7b3627a29";
"19.09".ap-southeast-1.hvm-ebs = "ami-083614e4d08f2164d";
"19.09".ap-southeast-2.hvm-ebs = "ami-0048c704185ded6dc";
"19.09".ap-northeast-1.hvm-ebs = "ami-0329e7fc2d7f60bd0";
"19.09".ap-northeast-2.hvm-ebs = "ami-03d4ae7d0b5fc364f";
"19.09".ap-south-1.hvm-ebs = "ami-0b599690b35aeef23";

latest = self."19.09";
}; in self