Skip to content
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

Jump to bottom

amazon-image: allow pkgs overrides #264635

Merged
merged 1 commit into from
Jun 2, 2024
Merged

amazon-image: allow pkgs overrides #264635

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
6 changes: 2 additions & 4 deletions nixos/maintainers/scripts/ec2/amazon-image.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ in {
'';

zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix {
inherit lib config configFile;
inherit lib config configFile pkgs;
inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package

includeChannel = true;

Expand Down Expand Up @@ -120,10 +119,9 @@ in {
};

extBuilder = import ../../../lib/make-disk-image.nix {
inherit lib config configFile;
inherit lib config configFile pkgs;

inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package

fsType = "ext4";
partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt";
Expand Down