From 69c2090e988b0a062b9ac2fa178e39989e2e080c Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Tue, 31 Oct 2023 11:01:46 -0700 Subject: amazon-image: allow pkgs overrides By reimporting pkgs this drops overlays. This reverts 0d3738cdcc48bd32a7eae9b914440b67c8db252e (`Fix the EC2 test`). Reasoning behind the reimport is blurry to me. --- nixos/maintainers/scripts/ec2/amazon-image.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'nixos/maintainers') diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 357b86367d984..8b6a9bc52b128 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -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; @@ -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"; -- cgit 1.4.1