Makefile: build-vm now reflects the repo being a flake
This commit is contained in:
parent
91d8d8a908
commit
8549d2f23d
8
Makefile
8
Makefile
@ -34,14 +34,12 @@ clean: ## Clean build artifacts and shutdown running virtual machines
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
build-vm: clean ## Build virtual machine for testing
|
build-vm: clean ## Build virtual machine for testing
|
||||||
nixos-rebuild build-vm \
|
nix build ".#nixosConfigurations.test.config.system.build.vm"
|
||||||
-I nixpkgs=http://nixos.org/channels/nixos-24.05/nixexprs.tar.xz \
|
|
||||||
-I nixos-config=./tests/test-config.nix
|
|
||||||
|
|
||||||
boot-vm: ## Run virtual machine in current terminal
|
boot-vm: ## Run virtual machine in current terminal
|
||||||
QEMU_KERNEL_PARAMS=console=ttyS0 \
|
QEMU_KERNEL_PARAMS=console=ttyS0 \
|
||||||
QEMU_NET_OPTS=hostfwd=tcp::8080-:80 \
|
QEMU_NET_OPTS=hostfwd=tcp::8080-:80 \
|
||||||
./result/bin/run-nixos-vm \
|
QEMU_OPTS=-nographic \
|
||||||
-nographic; \
|
./result/bin/run-nixos-vm
|
||||||
reset
|
reset
|
||||||
|
|
||||||
|
|||||||
12
flake.lock
generated
12
flake.lock
generated
@ -96,11 +96,11 @@
|
|||||||
"nixpkgs-regression": "nixpkgs-regression"
|
"nixpkgs-regression": "nixpkgs-regression"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735389339,
|
"lastModified": 1735586022,
|
||||||
"narHash": "sha256-JfQXQL0MysQSfvbw7xHto9YbqZ1VQLFgus+c4KYt6xg=",
|
"narHash": "sha256-17Wosqogo+6QMddJ8qo5C9NZug8QRuFO59KyTP/XfFw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "8a3fc27f1b63a08ac983ee46435a56cf49ebaf4a",
|
"rev": "61c3559116f0dccdd0c69cb35f411f2d6016c41a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -158,11 +158,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735264675,
|
"lastModified": 1735531152,
|
||||||
"narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=",
|
"narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966",
|
"rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user