Update to NixOS 22.11 #79

Manually merged
tlater merged 9 commits from tlater/22.11 into master 2023-01-11 02:39:59 +00:00
Showing only changes of commit 77ddb15f22 - Show all commits

View file

@ -73,15 +73,14 @@
###################
packages.${system} = let
inherit (nixpkgs.legacyPackages.${system}) writeShellScript;
vm = self.lib.makeNixosSystem {
inherit system;
extraModules = [(import ./configuration/hardware-specific/vm.nix)];
};
in {
default = self.packages.${system}.run-vm;
default = vm.config.system.build.vm;
run-vm = let
vm = self.lib.makeNixosSystem {
inherit system;
extraModules = [(import ./configuration/hardware-specific/vm.nix)];
};
qemuNetOpts = self.lib.makeQemuNetOpts {
"2222" = "2222";
"3080" = "80";
@ -105,9 +104,7 @@
'';
};
apps.${system} = let
inherit (nixpkgs.legacyPackages.${system}) writeShellScript;
in {
apps.${system} = {
default = {
type = "app";
program = builtins.toString self.packages.${system}.run-vm;