|
|
|
@ -5,7 +5,6 @@ |
|
|
|
|
|
|
|
|
|
outputs = { self }: |
|
|
|
|
let |
|
|
|
|
|
|
|
|
|
jobs = import ./pkgs/top-level/release.nix { |
|
|
|
|
nixpkgs = self; |
|
|
|
|
}; |
|
|
|
@ -28,10 +27,31 @@ |
|
|
|
|
lib = lib.extend (final: prev: { |
|
|
|
|
nixosSystem = { modules, ... } @ args: |
|
|
|
|
import ./nixos/lib/eval-config.nix (args // { |
|
|
|
|
modules = modules ++ |
|
|
|
|
[ { system.nixos.versionSuffix = |
|
|
|
|
modules = |
|
|
|
|
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; |
|
|
|
|
in |
|
|
|
|
modules ++ [ |
|
|
|
|
{ |
|
|
|
|
system.nixos.versionSuffix = |
|
|
|
|
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; |
|
|
|
|
system.nixos.revision = final.mkIf (self ? rev) self.rev; |
|
|
|
|
|
|
|
|
|
system.build = { |
|
|
|
|
vm = vmConfig.system.build.vm; |
|
|
|
|
vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; |
|
|
|
|
}; |
|
|
|
|
} |
|
|
|
|
]; |
|
|
|
|
}); |
|
|
|
|