nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #264635 from baloo/baloo/amazon-image/pkg-reimport

Browse Source
This commit is contained in:
Sandro 2024-06-02 23:42:06 +02:00 committed by GitHub
commit 729002e6ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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";