colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flake.nix: Deduplicate vmConfig, vmWithBootloaderConfig

Browse Source
This commit is contained in:
Robert Hensing 2021-12-17 14:04:03 +01:00
parent f72432aeb2
commit 537db62345
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
flake.nix
View File

@ -22,24 +22,6 @@
import ./nixos/lib/eval-config.nix (args // { import ./nixos/lib/eval-config.nix (args // {
modules = modules =
let let
vmConfig = (import ./nixos/lib/eval-config.nix
(args // {
modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ];
})).config;
vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix
(args // {
modules = modules ++ [
./nixos/modules/virtualisation/qemu-vm.nix
{ virtualisation.useBootLoader = true; }
({ config, ... }: {
virtualisation.useEFIBoot =
config.boot.loader.systemd-boot.enable ||
config.boot.loader.efi.canTouchEfiVariables;
})
];
})).config;
moduleDeclarationFile = moduleDeclarationFile =
let let
# Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't # Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't
@ -59,16 +41,16 @@
in in
map addModuleDeclarationFile modules ++ [ map addModuleDeclarationFile modules ++ [
{ ({ config, ... }: {
system.nixos.versionSuffix = system.nixos.versionSuffix =
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
system.nixos.revision = final.mkIf (self ? rev) self.rev; system.nixos.revision = final.mkIf (self ? rev) self.rev;
system.build = { system.build = {
vm = vmConfig.system.build.vm; vm = config.virtualisation.vmVariant.system.build.vm;
vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; vmWithBootLoader = config.virtualisation.vmVariantWithBootLoader.system.build.vm;
}; };
} })
]; ];
}); });
}); });