diff options
author | Rob Vermaas <rob.vermaas@gmail.com> | 2013-11-08 11:40:58 +0000 |
---|---|---|
committer | Rob Vermaas <rob.vermaas@gmail.com> | 2013-11-08 12:49:44 +0100 |
commit | 001550d5fe4174d081430d0da3790a815192eff6 (patch) | |
tree | b47898b778567c95046c8addb0220f2492f5642a /nixos/maintainers | |
parent | e9921632efc6a81ff7b36fc93dc29da521324a33 (diff) |
Adapt S3 ami creation script to new nixpkgs structure
Diffstat (limited to 'nixos/maintainers')
-rwxr-xr-x | nixos/maintainers/scripts/ec2/create-s3-amis.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/maintainers/scripts/ec2/create-s3-amis.sh b/nixos/maintainers/scripts/ec2/create-s3-amis.sh index 1aaac2832394b..140b4fcbddb83 100755 --- a/nixos/maintainers/scripts/ec2/create-s3-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-s3-amis.sh @@ -1,9 +1,8 @@ #! /bin/sh -e -nixos=$(nix-instantiate --find-file nixos) export NIXOS_CONFIG=$(dirname $(readlink -f $0))/amazon-base-config.nix -version=$(nix-instantiate --eval-only '<nixos>' -A config.system.nixosVersion | sed s/'"'//g) +version=$(nix-instantiate --eval-only '<nixpkgs/nixos>' -A config.system.nixosVersion | sed s/'"'//g) echo "NixOS version is $version" buildAndUploadFor() { @@ -11,13 +10,13 @@ buildAndUploadFor() { arch="$2" echo "building $system image..." - nix-build '<nixos>' \ + nix-build '<nixpkgs/nixos>' \ -A config.system.build.amazonImage --argstr system "$system" -o ec2-ami ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \ -c "$EC2_CERT" -k "$EC2_PRIVATE_KEY" - for region in eu-west-1 us-east-1 us-west-1 us-west-2; do + for region in eu-west-1; do echo "uploading $system image for $region..." name=nixos-$version-$arch-s3 |