diff options
Diffstat (limited to 'flake.nix')
-rw-r--r-- | flake.nix | 52 |
1 files changed, 48 insertions, 4 deletions
diff --git a/flake.nix b/flake.nix index e7c04417ac8..ececd26c153 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ outputs = { self }: let - jobs = import ./pkgs/top-level/release.nix { nixpkgs = self; }; @@ -19,6 +18,7 @@ "aarch64-linux" "armv6l-linux" "armv7l-linux" + "aarch64-darwin" ]; forAllSystems = f: lib.genAttrs systems (system: f system); @@ -28,10 +28,54 @@ lib = lib.extend (final: prev: { nixosSystem = { modules, ... } @ args: import ./nixos/lib/eval-config.nix (args // { - modules = modules ++ - [ { system.nixos.versionSuffix = - ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; + 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, ... }: { + virtualisation.useEFIBoot = + config.boot.loader.systemd-boot.enable || + config.boot.loader.efi.canTouchEfiVariables; + }) + ]; + })).config; + + moduleDeclarationFile = + let + # Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't + # mean that the evaluator always keeps track of its position. If there + # are too many levels of indirection, the position gets lost at some point. + intermediatePos = builtins.unsafeGetAttrPos "modules" args; + in + if intermediatePos == null then null else intermediatePos.file; + + # Add the invoking file as error message location for modules + # that don't have their own locations; presumably inline modules. + addModuleDeclarationFile = + m: if moduleDeclarationFile == null then m else { + _file = moduleDeclarationFile; + imports = [ m ]; + }; + + in + map addModuleDeclarationFile modules ++ [ + { + system.nixos.versionSuffix = + ".${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.build = { + vm = vmConfig.system.build.vm; + vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; + }; } ]; }); |