diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-09-08 21:49:06 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-09-08 21:49:06 +0000 |
| commit | fe0b5273cc9add01d97bfb5f35266f3027fd975d (patch) | |
| tree | 0f55d7d1e584f737180447b80eb0ead5275a288b /nixos/release.nix | |
| parent | 113f4d7b445e90b17a636584bbda40155baa3409 (diff) | |
nixos/release.nix: make `makeNetboot` more like `makeIso`
Diffstat (limited to 'nixos/release.nix')
| -rw-r--r-- | nixos/release.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 0fd8d694641f..167f2bca6b5a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -95,16 +95,19 @@ let buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; - modules = [ module versionModule ] ++ singleton + modules = [ configuration module versionModule ] ++ singleton ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; }); }).config)); - makeNetboot = config: + makeNetboot = { module, system, ... }: let - configEvaled = import lib/eval-config.nix config; + configEvaled = import lib/eval-config.nix { + inherit system; + modules = [ module versionModule ]; + }; build = configEvaled.config.system.build; kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; in @@ -139,11 +142,8 @@ in rec { initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk); netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot { + module = ./modules/installer/netboot/netboot-minimal.nix; inherit system; - modules = [ - ./modules/installer/netboot/netboot-minimal.nix - versionModule - ]; }); iso_minimal = forAllSystems (system: makeIso { |