tlaternet/tlaternet-server
1
0
Fork 0
Code Issues 10 Pull requests Activity

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
Conversation 0 Commits 9 Files changed 13 +6 -9
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 77ddb15f22 - Show all commits

11
flake.nix
View file

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