dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

amazon-image: allow pkgs overrides

Browse Source 
By reimporting pkgs this drops overlays.

This reverts 0d3738cdcc
(`Fix the EC2 test`). Reasoning behind the reimport is blurry to me.
This commit is contained in:
Arthur Gautier 2023-10-31 11:01:46 -07:00
parent baa26b9fb9
commit 69c2090e98
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/maintainers/scripts/ec2/amazon-image.nix
View File

@ -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";