movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

pkgs/top-level: make package sets composable (reapply) (#376988)

Browse source
This commit is contained in:
Wolfgang Walther 2025-02-02 11:41:17 +01:00 • committed by GitHub
commit c1793a336b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 262 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/appliance-repart-image-verity-store.nix
View file

@ -40,7 +40,7 @@
verityStore = {
enable = true;
# by default the module works with systemd-boot, for simplicity this test directly boots the UKI
ukiPath = "/EFI/BOOT/BOOT${lib.toUpper config.nixpkgs.hostPlatform.efiArch}.EFI";
ukiPath = "/EFI/BOOT/BOOT${lib.toUpper pkgs.stdenv.hostPlatform.efiArch}.EFI";
};
name = "appliance-verity-store-image";
@ -51,7 +51,7 @@
repartConfig = {
Type = "esp";
Format = "vfat";
SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M";
SizeMinBytes = if pkgs.stdenv.hostPlatform.isx86_64 then "64M" else "96M";
};
};
${partitionIds.store-verity}.repartConfig = {

4
nixos/tests/appliance-repart-image.nix
View file

@ -53,7 +53,7 @@ in
"esp" = {
contents =
let
efiArch = config.nixpkgs.hostPlatform.efiArch;
efiArch = pkgs.stdenv.hostPlatform.efiArch;
in
{
"/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =
@ -70,7 +70,7 @@ in
# aarch64 kernel seems to generally be a little bigger than the
# x86_64 kernel. To stay on the safe side, leave some more slack
# for every platform other than x86_64.
SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M";
SizeMinBytes = if pkgs.stdenv.hostPlatform.isx86_64 then "64M" else "96M";
};
};
"swap" = {