c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

treewide: run nixfmt 1.0.0

Browse source
This commit is contained in:
Wolfgang Walther 2025-07-22 15:19:36 +02:00
commit 5a0711127c
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
5118 changed files with 100492 additions and 103190 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nixos/modules/installer/cd-dvd/iso-image.nix
View file

@ -797,7 +797,8 @@ in
device = "/iso/nix-store.squashfs";
options = [
"loop"
] ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi";
]
++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi";
neededForBoot = true;
};
@ -869,7 +870,8 @@ in
environment.systemPackages = [
grubPkgs.grub2
] ++ lib.optional (config.isoImage.makeBiosBootable) pkgs.syslinux;
]
++ lib.optional (config.isoImage.makeBiosBootable) pkgs.syslinux;
system.extraDependencies = [ grubPkgs.grub2_efi ];
# In stage 1 of the boot, mount the CD as the root FS by label so
@ -901,9 +903,10 @@ in
# Closures to be copied to the Nix store on the CD, namely the init
# script and the top-level system configuration directory.
isoImage.storeContents =
[ config.system.build.toplevel ]
++ lib.optional config.isoImage.includeSystemBuildDependencies config.system.build.toplevel.drvPath;
isoImage.storeContents = [
config.system.build.toplevel
]
++ lib.optional config.isoImage.includeSystemBuildDependencies config.system.build.toplevel.drvPath;
# Individual files to be included on the CD, outside of the Nix
# store on the CD.