@@ -5,7 +5,6 @@
55
66 outputs = { self }:
77 let
8−
98 jobs = import ./pkgs/top-level/release.nix {
109 nixpkgs = self;
1110 };
@@ -28,10 +27,31 @@
2827 lib = lib.extend (final: prev: {
2928 nixosSystem = { modules, ... } @ args:
3029 import ./nixos/lib/eval-config.nix (args // {
31− modules = modules ++
32− [ { system.nixos.versionSuffix =
30+ modules =
31+ let
32+ vmConfig = (import ./nixos/lib/eval-config.nix
33+ (args // {
34+ modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ];
35+ })).config;
36+
37+ vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix
38+ (args // {
39+ modules = modules ++ [
40+ ./nixos/modules/virtualisation/qemu-vm.nix
41+ { virtualisation.useBootLoader = true; }
42+ ];
43+ })).config;
44+ in
45+ modules ++ [
46+ {
47+ system.nixos.versionSuffix =
3348 ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
3449 system.nixos.revision = final.mkIf (self ? rev) self.rev;
50+
51+ system.build = {
52+ vm = vmConfig.system.build.vm;
53+ vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
54+ };
3555 }
3656 ];
3757 });