jeeves/oslib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up and fix flake

Browse source
This commit is contained in:
Jeeves 2024-06-24 14:11:39 -06:00
parent 19ab6d3c70
commit bb3c001b00
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.nix
View file

@ -22,16 +22,6 @@
inherit (oslib) osdb; inherit (oslib) osdb;
zig-env = zig2nix.outputs.zig-env.${system} { zig = zig2nix.outputs.packages.${system}.zig.master.bin; }; zig-env = zig2nix.outputs.zig-env.${system} { zig = zig2nix.outputs.packages.${system}.zig.master.bin; };
# hello-vm = oslib.mkVM {
# name = "hello";
# uuid = "c0c49ae7-6fe4-4c39-a8ae-c80c6b689344";
# arch = "x86_64";
# isos.beforeInstall = [
# { index = 1; file = "${osdb.windows."6.1.7601".professional.x86_64.installer}/out.iso"; }
# { index = 2; file = "${osdb.windows."6.1.7601".professional.x86_64.unattend}/out.iso"; }
# ];
# };
in { in {
mkFlake = config: mkFlake = config:
flake-utils.lib.eachDefaultSystem(system: flake-utils.lib.eachDefaultSystem(system:
@ -39,7 +29,7 @@
vm = oslib.mkVM { vm = oslib.mkVM {
inherit (config) name uuid; inherit (config) name uuid;
inherit (config.os) arch; inherit (config.os) arch;
beforeInstall = [ isos.beforeInstall = [
{ index = 1; file = "${osdb.${config.os.name}.${config.os.version}.${config.os.edition}.${config.os.arch}.installer}/out.iso"; } { index = 1; file = "${osdb.${config.os.name}.${config.os.version}.${config.os.edition}.${config.os.arch}.installer}/out.iso"; }
{ index = 2; file = "${osdb.${config.os.name}.${config.os.version}.${config.os.edition}.${config.os.arch}.unattend}/out.iso"; } { index = 2; file = "${osdb.${config.os.name}.${config.os.version}.${config.os.edition}.${config.os.arch}.unattend}/out.iso"; }
]; ];
@ -53,10 +43,6 @@
}); });
apps = { apps = {
# hello-start-vm = flake-utils.lib.mkApp {
# drv = hello-vm.start-vm;
# exePath = "";
# };
default = zig-env.app-no-root [] "zig build run -- \"$@\""; default = zig-env.app-no-root [] "zig build run -- \"$@\"";
}; };

8
server/flakes/windows/test/flake.lock generated
View file

@ -126,11 +126,11 @@
"zig2nix": "zig2nix" "zig2nix": "zig2nix"
}, },
"locked": { "locked": {
"lastModified": 1719259701, "lastModified": 1719259792,
"narHash": "sha256-gl+QC6wnvXbH+oJwqek7N64IPAkKmYwdGp5VjH7bweI=", "narHash": "sha256-XX8MuiwtbYvIfb2M7l7gG5wT8Lp5HFS7KMuWEtENnF0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "0a2dd279027547fc4494d9b2931298bc2b35024e", "rev": "19ab6d3c7058aa553843e4cb5282e4d970d0e4fd",
"revCount": 4, "revCount": 5,
"type": "git", "type": "git",
"url": "https://git.jeevio.xyz/jeeves/oslib" "url": "https://git.jeevio.xyz/jeeves/oslib"
}, },