installer/iso-image: use system.build.image

and rename:
- isoImage.isoBaseName -> image.baseName
- isoImage.isoName -> image.fileName

phaer a582fba7 22255dde

Changed files
+33 -22
nixos
pkgs
desktops
-3
nixos/modules/installer/cd-dvd/installation-cd-base.nix
···
# Adds terminus_font for people with HiDPI displays
console.packages = options.console.packages.default ++ [ pkgs.terminus_font ];
-
# ISO naming.
-
isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso";
-
# EFI booting
isoImage.makeEfiBootable = true;
···
# Adds terminus_font for people with HiDPI displays
console.packages = options.console.packages.default ++ [ pkgs.terminus_font ];
# EFI booting
isoImage.makeEfiBootable = true;
+31 -17
nixos/modules/installer/cd-dvd/iso-image.nix
···
in
{
-
options = {
-
-
isoImage.isoName = lib.mkOption {
-
default = "${config.isoImage.isoBaseName}.iso";
-
type = lib.types.str;
-
description = ''
-
Name of the generated ISO image file.
-
'';
-
};
-
isoImage.isoBaseName = lib.mkOption {
-
default = config.system.nixos.distroId;
-
type = lib.types.str;
-
description = ''
-
Prefix of the name of the generated ISO image file.
-
'';
-
};
isoImage.compressImage = lib.mkOption {
default = false;
···
boot.loader.timeout = 10;
# Create the ISO image.
system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
-
inherit (config.isoImage) isoName compressImage volumeID contents;
bootable = config.isoImage.makeBiosBootable;
bootImage = "/isolinux/isolinux.bin";
syslinux = if config.isoImage.makeBiosBootable then pkgs.syslinux else null;
···
in
{
+
imports = [
+
(lib.mkRenamedOptionModuleWith {
+
sinceRelease = 2505;
+
from = [
+
"isoImage"
+
"isoBaseName"
+
];
+
to = [
+
"image"
+
"baseName"
+
];
+
})
+
(lib.mkRenamedOptionModuleWith {
+
sinceRelease = 2505;
+
from = [
+
"isoImage"
+
"isoName"
+
];
+
to = [
+
"image"
+
"fileName"
+
];
+
})
+
../../image/file-options.nix
+
];
+
options = {
isoImage.compressImage = lib.mkOption {
default = false;
···
boot.loader.timeout = 10;
# Create the ISO image.
+
image.extension = if config.isoImage.compressImage then "iso.zst" else "iso";
+
image.filePath = "iso/${config.image.fileName}";
+
system.build.image = config.system.build.isoImage;
system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
+
inherit (config.isoImage) compressImage volumeID contents;
+
isoName = "${config.image.baseName}.iso";
bootable = config.isoImage.makeBiosBootable;
bootImage = "/isolinux/isolinux.bin";
syslinux = if config.isoImage.makeBiosBootable then pkgs.syslinux else null;
+1 -1
nixos/release.nix
···
hydraJob ((import lib/eval-config.nix {
inherit system;
modules = makeModules module {
-
isoImage.isoBaseName = "nixos-${type}";
};
}).config.system.build.isoImage);
···
hydraJob ((import lib/eval-config.nix {
inherit system;
modules = makeModules module {
+
image.baseName = "nixos-${type}";
};
}).config.system.build.isoImage);
+1 -1
pkgs/desktops/gnome/installer.nix
···
config = (import ../../../../nixos/lib/eval-config.nix {
inherit system;
-
modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules;
}).config;
in
···
config = (import ../../../../nixos/lib/eval-config.nix {
inherit system;
+
modules = [ module { image.baseName = isoBaseName; } ] ++ extraModules;
}).config;
in