Skip to content

nixos/release: replace amazonImage with amazonConfig #402794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arianvp wants to merge 1 commit into from
Closed

nixos/release: replace amazonImage with amazonConfig #402794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions nixos/release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,13 @@ rec {
)
);

# A disk image that can be imported to Amazon EC2 and registered as an AMI
amazonImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (
# The config for A disk image that can be imported to Amazon EC2 and registered as an AMI

@mweinelt mweinelt Apr 29, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# The config for A disk image that can be imported to Amazon EC2 and registered as an AMI
# The config for a disk image that can be imported to Amazon EC2 and registered as an AMI

# We do not actually build the AMI, but just the config that goes into the AMI.
# make-disk-image is already tested in other places.
# actual AMI build happens in https://github.com/NixOS/amis
amazonConfig = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (
system:

with import ./.. { inherit system; };

hydraJob (
(import lib/eval-config.nix {
inherit system;
Expand All @@ -317,26 +318,8 @@ rec {
versionModule
./maintainers/scripts/ec2/amazon-image.nix
];
}).config.system.build.amazonImage
}).config.system.build.toplevel
)

);
amazonImageZfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (
system:

with import ./.. { inherit system; };

hydraJob (
(import lib/eval-config.nix {
inherit system;
modules = [
configuration
versionModule
./maintainers/scripts/ec2/amazon-image-zfs.nix
];
}).config.system.build.amazonImage
)

);

# An image that can be imported into incus and used for container creation
Expand Down